Commit Graph

721 Commits

Author SHA1 Message Date
fjy 13de51494e update versions in tutorials and docs 2015-02-12 16:11:31 -08:00
Fangjin Yang e915675b97 Merge pull request #1112 from druid-io/fix-examples
Update realtime node configs for examples; fixes #1111
2015-02-12 15:44:15 -08:00
fjy 34ed474d40 Add docs for http endpoints 2015-02-11 16:12:51 -08:00
fjy 63338e6e35 Update realtime node configs for examples; fixes #1111 2015-02-11 14:34:02 -08:00
Xavier Léauté 72333731c3 Merge pull request #1101 from druid-io/update
Update poms and add docs for backwards compat JSON parser
2015-02-09 16:14:57 -08:00
fjy e5debb2dec update poms and add docs for backwards compat 2015-02-09 16:13:00 -08:00
Fangjin Yang cb4f894ef7 Merge pull request #1087 from metamx/fixIndexerBaseRelativity
Fix overriding base of IndexerZkConfig to be absolute instead of relative
2015-02-04 14:10:21 -08:00
Fangjin Yang 60b2d920bc Merge pull request #1088 from metamx/upload-docs-s3
Upload documentation to static.druid.io
2015-02-04 13:23:27 -08:00
Charles Allen 79a3e8f59f Fix overriding base of IndexerZkConfig to be absolute instead of relative
* Updated docs to clarify ZK config behavior
* Added unit tests for this case
2015-02-04 13:04:06 -08:00
Xavier Léauté ae78b1450e upload documentation to static.druid.io 2015-02-04 12:56:52 -08:00
fjy 67ecb07ccd update version in docs 2015-02-03 14:26:42 -08:00
fjy d05032b98a towards a community led druid 2015-01-31 20:57:36 -08:00
fjy b9337e883a I'm all about them doc fixes 2015-01-21 22:04:48 -08:00
fjy f437e16543 moar doc fixes 2015-01-21 21:59:16 -08:00
fjy e33e45e69e one more doc fix 2015-01-21 21:52:23 -08:00
fjy 74a4fddcfe fix task docs 2015-01-21 21:48:48 -08:00
fjy 7540f2f562 Add more docs for production clusters 2015-01-21 14:21:27 -08:00
Xavier Léauté 5a2030c49b Merge pull request #1059 from druid-io/remove-test
Remove test rejection policy - it has no place anywhere
2015-01-20 13:39:46 -08:00
Xavier Léauté a74ced97d9 Merge pull request #1058 from druid-io/equal-dist
Add a new equal distribution strategy for assigning tasks
2015-01-20 13:27:32 -08:00
fjy 1ff5829d6d remove test rejection policy 2015-01-20 13:22:30 -08:00
fjy 2d516fa591 Add a new equal distribution strategy for assigning tasks 2015-01-20 13:12:22 -08:00
Charles Allen 3d27747f7e Upgrade to log4j2
Default behavior is as before.
Added documentation for how to enable synchronous logging for select chatty classes:
* io.druid.client.ServerInventoryView
* io.druid.client.BatchServerInventoryView
* io.druid.curator.inventory.CuratorInventoryManager
* com.metamx.http.client.pool.ChannelResourceFactory
2015-01-20 12:35:18 -08:00
Fangjin Yang 91a79dbf95 Merge pull request #1031 from metamx/ingestmetadata-query
DataSourceMetadata query
2015-01-19 21:55:35 -08:00
Fangjin Yang 068518216b Merge pull request #1048 from metamx/update-tutorial
update tutorial to create db utf8 by default
2015-01-19 11:02:17 -08:00
Xavier Léauté 2443dda46b update tutorial to create db utf8 by default 2015-01-16 20:52:40 -08:00
nishantmonu51 503631f6ff review comments. 2015-01-16 20:21:40 +05:30
Igal Levy e86273a9ae New section to provide detail on how and why to set up sharding
* Different types of sharding strategies
* How and what to configure
* Redundancy and scale-out
2015-01-15 21:19:53 -08:00
nishantmonu51 c7452b75f6 Merge branch 'master' into ingestmetadata-query 2015-01-15 18:00:31 +05:30
Maarten Rijke 58b334c8e6 Fix some of the Task json examples to have the correct description 2015-01-15 09:41:23 +01:00
fjy a02ef1dbf1 update batch ingest docs 2015-01-08 14:38:10 -08:00
Gian Merlino dde21a16e1 Improve maxPendingPersists docs. 2015-01-07 09:55:33 -08:00
Xavier Léauté 47fa1b3d10 update docs to point to druid-io/druid 2014-12-23 11:26:52 -08:00
fjy ac407fb6ba clean up defaults 2014-12-15 15:05:02 -08:00
Fangjin Yang 335fbebb94 Merge pull request #960 from metamx/new-config
Rewrite config docs for 0.7.x
2014-12-15 13:35:25 -07:00
Charles Allen 225a039a01 Merge pull request #965 from metamx/doc-fix
Fix documented default value for druid.coordinator.merge.on.
2014-12-13 11:13:14 -08:00
Gian Merlino 020f8653f0 Fix documented default value for druid.coordinator.merge.on. 2014-12-13 08:03:09 -08:00
fjy 818f85e745 rewrite config docs 2014-12-11 15:52:26 -08:00
nishantmonu51 a0d3579a92 add docs + fix tests 2014-12-11 17:58:01 +05:30
Fangjin Yang d6d3ec6846 Merge pull request #948 from metamx/ingestion-docs
Redocumenting ingestion
2014-12-09 15:30:03 -07:00
fjy f0e5bb1ba9 remove excess tutorials 2014-12-09 14:29:19 -08:00
fjy 5727193873 more fixes to docs 2014-12-09 14:28:15 -08:00
fjy 4e3d8faed8 fix bad example 2014-12-09 14:21:47 -08:00
fjy 9596c11f42 address cr 2014-12-09 14:19:18 -08:00
fjy 38a369c0ff fix links and some errors 2014-12-08 16:20:35 -08:00
fjy 28b72a69ad redocumenting ingestion 2014-12-08 16:15:46 -08:00
Charles Allen 0fbbcd5885 Move some config description from Configuration.md to the Broker and Historical config pages 2014-12-08 15:53:58 -08:00
xvrl 1392e2731f Merge pull request #936 from metamx/cachingRunnerImprovements
General Caching Query Runners cleanup (40% query time reduction for HLL)
2014-12-08 14:07:52 -08:00
Charles Allen 7b65f0635d General Caching Query Runners cleanup
* Add type strictness to CachingClusteredClient.
* Add background caching to CachingClusteredClient. Gives between 0% and 5% query speed increase.
* Add @BackgroundCaching annotation for injected ExecutorService items
* Add `numBackgroundThreads' configuration options to CacheConfig (default 0 aka same thread legacy behavior)
* Add unit tests for CacheConfig
* Add an abstract caching query runner class, currently it doesn't do anything exceppt simply make the two caching queries distinct.
* Add caching to CachingQueryRunner. Gives up to a WHOPPING 40% reduction in query time on HLL queries
* Updated docs with more info on cache settings.
2014-12-08 13:29:32 -08:00
Fangjin Yang 86a837a653 Merge pull request #939 from 7eggs/doc-fixes
Fix link to Druid Cluster Tutorial in Booting a Druid Cluster page
2014-12-08 12:10:15 -07:00
Alexander Makarenko 6dfa0d20b8 Fix link to Druid Cluster Tutorial in Booting a Druid Cluster page 2014-12-07 21:59:06 +03:00
Fangjin Yang 1a4e798373 Merge pull request #938 from 7eggs/doc-fixes
Broker config small fix
2014-12-07 09:48:53 -07:00
Alexander Makarenko df5b525097 Broker config small fix 2014-12-07 18:59:22 +03:00
Alexander Makarenko bbd337235e Add Node.js client to Community Libraries 2014-12-07 03:51:35 +03:00
fjy 8ee4d12562 Refactor structure for examples and extensions 2014-11-21 14:45:24 -08:00
nishantmonu51 e3260aa177 Filtered Aggregator fixes + enhancements
- fix NPE on IncrementIndex
- refactor code to support AND, OR filter
- tests for AND & OR filter
- handling for missing column / null values
2014-11-20 15:17:18 -08:00
nishantmonu51 2f08ab85fc Revert "update doc"
This reverts commit d66d0de54f.
2014-11-20 10:17:07 +05:30
nishantmonu51 d66d0de54f update doc 2014-11-20 09:29:26 +05:30
Fangjin Yang db8a168b91 Merge pull request #881 from mrijke/update-ruleconf-docs
Update Rule-Configuration docs: match example with description
2014-11-18 16:41:49 -07:00
Fangjin Yang 87ea6fd377 Merge pull request #878 from metamx/default-extension-version
use Druid version as the default version for extensions
2014-11-18 13:56:54 -07:00
Xavier Léauté bf04ad0eb3 add documentation 2014-11-18 10:50:18 -08:00
Maarten Rijke 06e4535cb8 Update Rule-Configuration: match example with description
The example JSON snippets of the 'loadForever' and the 'dropForever' don't match their description, the 'type' description mentions 'loadByInterval' and 'dropByPeriod' respectively.
2014-11-18 17:00:42 +01:00
nishantmonu51 b2e8073c61 document combining firehose 2014-11-18 11:01:08 +05:30
fjy afd419ea29 fix bugs with docs 2014-11-14 13:25:21 -08:00
Fangjin Yang d85c172285 Merge pull request #808 from metamx/igalDruid
Clarify value types for granularities; link to more ISO info; more info on OrderByColumnSpec
2014-11-14 14:20:37 -07:00
Eric Bouchut e89f2f973d Fix typo in DimensionSpecs 2014-11-13 15:35:09 +01:00
Xavier Léauté ba442b9882 fix default FilteredServerView + batch annoucement 2014-11-12 23:17:16 -08:00
fjy 26b358e127 Merge branch 'master' of github.com:metamx/druid into druid-0.7.x 2014-11-11 17:30:30 -08:00
Igal Levy de7fb5a690 fixed typo, added note on matching schema requirement for unioned data sources 2014-11-11 11:56:22 -08:00
Igal Levy 34a6f7f7ca Merge branch 'master' into fix-datasource-doc 2014-11-11 11:55:47 -08:00
fjy 6188315293 Merge branch 'master' into druid-0.7.x
Conflicts:
	processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java
2014-11-10 14:52:10 -08:00
Igal Levy 03515a4de6 fixes typo 2014-11-07 10:40:46 -08:00
xvrl 18b9c5cd2f db -> metadata 2014-11-06 21:46:35 -08:00
Igal Levy 20562492de clarified that dimension and metric can be String too, not just object 2014-11-06 15:16:36 -08:00
Igal Levy ec0accf0b1 clarified that dimensions and metrics are given in String arrays 2014-11-06 15:13:30 -08:00
Igal Levy 8f0b675e23 Added info to better explain how to use pagingSpec 2014-11-06 14:50:01 -08:00
Igal Levy 5a98fcf5b9 typo: s/metric_value/metric_name/ and added quotes 2014-11-06 11:18:30 -08:00
Igal Levy 73226f20cc typo: s/metric_value/metric_name/ 2014-11-06 11:01:31 -08:00
Igal Levy 81227b63a7 Merge branch 'master' into fix-query-docs 2014-11-04 11:09:13 -08:00
xvrl 2c62b9e6e3 Merge pull request #821 from metamx/minor-fix
Some minor fixes in docs and change jetty defaults
2014-11-04 10:18:57 -08:00
fjy 42cf20c9f1 some minor fixes in docs and change jetty defaults 2014-11-04 10:08:50 -08:00
Xavier Léauté f56d026d7d fix realtime module + cleaner metadata abstraction
- better metadata abstractions
- more db->metadata renaming
2014-11-03 16:40:23 -08:00
Igal Levy c58fc503d9 Clarified sort as optional, object 2014-11-03 11:59:04 -08:00
Igal Levy b416c3ff5c added quotes to clarify string value; added example of numeric filter 2014-11-03 11:57:52 -08:00
Xavier Léauté 48e6bef250 update documentation with new property names 2014-11-03 09:25:39 -08:00
Igal Levy e07b02f54b fixed typo and added info that union can take any number of dataSources 2014-10-31 11:07:55 -07:00
Igal Levy 0906b21079 Merge branch 'master' into fix-datasource-doc 2014-10-30 16:26:16 -07:00
Igal Levy 479c196aa4 Added section on union data sources 2014-10-29 12:32:24 -07:00
Igal Levy 23315e298d expanded and clarified OrderByColumnSpec section 2014-10-28 10:38:21 -07:00
Xavier Léauté 575919ec6c provide a little more involved example 2014-10-27 19:18:09 -07:00
Igal Levy f62221bfae added link to DimensionSpec for alternative way to provide dimensions 2014-10-23 14:30:02 -07:00
Igal Levy f76d68e2c9 added missing anchor to fix broken internal link 2014-10-23 12:49:44 -07:00
Igal Levy 374ba8ab5e minor edits based on Vad's feedback 2014-10-23 11:38:01 -07:00
fjy d76d57d95d update docs 2014-10-22 16:16:28 -07:00
nishantmonu51 0785baf54c review comments 2014-10-22 21:28:31 +05:30
nishantmonu51 6cb6ec39cf add support for not filter and add test 2014-10-22 10:25:24 +05:30
Xavier Léauté 34f2c74331 add docs 2014-10-21 17:24:44 -07:00
fjy ee392b6064 more updates to docs 2014-10-21 16:26:17 -07:00
fjy 2d96bc5f1f more FAQ docs 2014-10-21 16:08:56 -07:00
Fangjin Yang 5df92aff2c Merge pull request #797 from metamx/igalDruid
Igal druid
2014-10-21 16:47:47 -06:00
Xavier Léauté 9d5e65913d fix serde 2014-10-21 15:05:08 -07:00
Xavier Léauté b32ce31eff add documentation 2014-10-20 14:12:30 -07:00
Igal Levy 1dd9aeba4f removed link with no target 2014-10-19 21:22:10 -07:00
Igal Levy b7c4983a91 added syntax highlighting 2014-10-19 18:38:20 -07:00
Igal Levy 63a4f2dc05 fixed broken internal link 2014-10-19 18:29:34 -07:00
Fangjin Yang 82fc6e5358 Merge pull request #793 from metamx/partitions-docs
New PartitionsSpec docs.
2014-10-19 15:33:16 -06:00
Gian Merlino 20d29666af New PartitionsSpec docs. 2014-10-16 13:17:13 -07:00
fjy 35716e8dee add a best practices doc 2014-10-13 14:33:45 -07:00
fjy d4f5a71ded prepare for next release 2014-10-13 12:48:12 -07:00
Xavier Léauté 8304365948 move thanks page to main site 2014-10-10 10:19:33 -07:00
fjy 0532208c25 prepare for next release 2014-10-09 14:21:38 -07:00
Xavier Léauté fa27908ae4 and another one, fixes #782 2014-10-09 10:28:33 -07:00
Xavier Léauté e2e912cdc3 fix broken link, resolved #782 2014-10-09 10:26:47 -07:00
fjy 21ac3f2aab slight clarification about hadoop setup 2014-10-08 10:56:00 -07:00
fjy 8a34a55c0b add example hadoop config 2014-10-08 10:51:00 -07:00
fjy 1ce67dcfc4 prepare for next release 2014-10-07 14:27:47 -07:00
fjy 19dc32d314 add headers for druid vs pages 2014-10-07 13:50:32 -07:00
fjy f1d37d569c doc fixes 2014-10-07 13:01:41 -07:00
fjy ee0e856029 correct mistakes 2014-10-06 14:23:23 -07:00
fjy 546fca2d67 docs for router node 2014-10-06 14:18:25 -07:00
fjy d9453f29f1 fix docs 2014-09-30 15:02:06 -07:00
fjy 5b166134fb add docs 2014-09-30 14:59:02 -07:00
fjy e367f76824 Merge pull request #757 from pdeva/master
FAQ on changing data granularity
2014-09-29 15:40:37 -06:00
pdeva bc66b42acc FAQ on changing data granularity
added cause this question is asked a ton of times on google group and i had a similar question and had to resort to the forums cause there was no doc.
2014-09-25 01:48:45 -07:00
Xavier Léauté 13ac7de882 update doc versions 2014-09-23 16:28:18 -07:00
fjy c042ce5b4b prep next rel 2014-09-23 16:10:12 -07:00
fjy d19723e186 Merge pull request #749 from metamx/background-segment-announcing
Parallelize segment loading + background announcing
2014-09-23 17:07:51 -06:00
fjy bdea4f45ea fixes #733 2014-09-23 15:41:56 -07:00
Xavier Léauté d7b39fa7ea add documentation 2014-09-23 09:30:40 -07:00
xvrl 5e0b6b9896 Merge pull request #746 from pdeva/master
segment metadata result explained better
2014-09-22 10:27:35 -07:00
Xavier Léauté 815ebeee25 add docs for background segments loading 2014-09-18 12:09:20 -07:00
pdeva d53ccf7ead segment metadata result explained better 2014-09-16 15:56:15 -07:00
fjy fbeb57d261 prepare for next release 2014-09-16 15:18:27 -07:00
fjy c1a0961f98 Merge pull request #731 from pdeva/master
Corrected documentation for IngestSegmentFirehose
2014-09-16 10:54:29 -06:00
pdeva d674e611de described how to enable experimental features 2014-09-15 14:41:57 -07:00
pdeva 4a23cd94ef Corrected documentation for IngestSegmentFirehose
Ingest Segment firehose had incorrect documentation.
2014-09-14 11:22:36 -07:00
Xavier Léauté 17b6ed2cbe fix docs deploy 2014-09-05 11:44:34 -07:00
Xavier Léauté 958f2f9abd fix docs versions 2014-09-05 11:40:51 -07:00
Xavier Léauté 280681e84b add option to generate only api or only docs 2014-09-05 10:55:44 -07:00
fjy 963a44a8d4 Merge branch 'master' of github.com:metamx/druid 2014-09-05 10:15:47 -07:00
fjy eecda34940 fix tutorial with msg that no longer exists 2014-09-05 10:15:37 -07:00
Xavier Léauté f0d67fe873 deploy api docs 2014-09-04 16:13:43 -07:00
Xavier Léauté 3c131f4d13 update version in docs 2014-09-04 13:47:25 -07:00
fjy 6e75cb755d Merge pull request #719 from pdeva/master
clarify division operation in post aggregation
2014-09-04 11:26:42 -06:00
Xavier Léauté 23a2b84703 fix broken link, resolves #718 2014-08-31 21:51:12 +00:00
pdeva 1bad66c16d clarify division operation in post aggregation 2014-08-31 09:56:15 -07:00
Xavier Léauté 6f45f88f26 fix post-aggregations broken link 2014-08-29 16:39:09 -07:00
pdeva 7c47c60c4b explain what 'full cluster view' means 2014-08-26 03:02:05 -07:00
fjy 7ca3b2d27c update docs 2014-08-22 08:26:25 -07:00
fjy 85ff054726 prepare for next release 2014-08-21 12:47:55 -07:00
fjy 29d14b772f prepare for next release 2014-08-14 14:56:27 -07:00
Amy Troschinetz 71b8db631c Updates Cassandra example documentation.
Updates the required properties to enable Cassandra as deep storage.
Also adds more information about how to create the required keystore,
and which properties files need to be modified to support Cassandra.
Also adds syntax highlighting to the provided example code.

Additionally, moves Cassandra Deep Storage documentation out into the
actual documentation hierarchy with appropriate linkage. A stub
README.md is left in the example directory to provide a useful landing
page for existing weblinks to the original documentation.
2014-08-14 16:36:36 -05:00
fjy 79f6486b88 prepare for next release 2014-08-12 13:22:23 -07:00
fjy d4014c6a4e Merge pull request #675 from metamx/slimmer-column-cache
reduce object count overhead of column cache
2014-08-12 14:16:33 -06:00
Xavier Léauté 1c244c8be8 add column cache docs 2014-08-12 10:40:09 -07:00
fjy bd98e0dd29 prep next release 2014-08-09 19:33:31 -07:00
fjy 8998700760 prepare for next release 2014-08-08 16:19:45 -07:00
fjy 8e87cae990 prepare for next rel 2014-08-08 15:51:22 -07:00
fjy 35937132a7 prep next release 2014-08-08 14:35:22 -07:00
fjy bb44056810 prepare for next release 2014-08-08 11:38:17 -07:00
fjy 57a979ef19 prepare for next release 2014-08-06 13:31:27 -07:00
Gian Merlino 6e33cd4e0a Coordinator drop/remove related stuff.
- DruidCoordinatorCleanup should wait for availableSegments to populate
  before dropping any segments.
- Clarify that millisToWaitBeforeDeleting applies to "removing" rather than
  "dropping" segments.
- LoadRule shouldn't need to wait for the deletionWaitTime before dropping
  excess replicas.
2014-08-06 12:52:09 -07:00
Xavier Léauté 8f615212a9 new deploy script that automatically submits a pull request 2014-08-01 15:42:22 -07:00
Xavier Léauté 91fc5fc82d reformatting 2014-08-01 15:28:13 -07:00
Xavier Léauté a0a12f5989 remove css from docs 2014-08-01 15:28:13 -07:00
Xavier Léauté cd5ccc39fb updated deploy script 2014-08-01 15:28:13 -07:00
Xavier Léauté e158aa30a7 add timeboundary docs 2014-08-01 10:44:45 -07:00
fjy 362be7a2c0 prepare for next release 2014-08-01 10:12:03 -07:00
fjy 046e8864b1 more docs 2014-08-01 10:10:23 -07:00
Xavier Léauté 2667cd5188 cleanup docs template for preview 2014-08-01 10:01:19 -07:00
Xavier Léauté b44546ad8c query cancellation/timeout docs + missing items 2014-08-01 09:48:06 -07:00
fjy 90ebeaa8d3 fix broken approx histo doc 2014-08-01 09:42:52 -07:00
nishantmonu51 80a4f7c5b5 doc for IngestSegmentFirehose 2014-08-01 16:43:39 +05:30
fjy d202eae3b5 toc fix 2014-07-31 17:27:16 -07:00
fjy 611dcb9d1c new docs on logging
Conflicts:
	docs/content/toc.textile
2014-07-31 17:26:15 -07:00
fjy 17c600c691 some doc fixes 2014-07-31 17:25:30 -07:00
fjy e5ce9b4a2a prepare for next release 2014-07-31 14:05:56 -07:00
fjy 32bd7003ec minor doc fix 2014-07-31 12:58:19 -07:00
fjy 147f5754da add missing doc 2014-07-31 10:23:48 -07:00
fjy 625377fdd2 prep next rel 2014-07-29 22:00:11 -07:00
fjy 7803ca07e7 fix broken chat handler 2014-07-29 17:58:21 -07:00
fjy 89149b5fcb prepare for next release 2014-07-29 17:38:19 -07:00
fjy 0be5d27f2a another docs fix 2014-07-29 11:40:35 -07:00
fjy d9c9190e2f fix breakage in batch ingestion schema 2014-07-29 11:36:29 -07:00
Jasmine Hegman 1844bf4f08 Adding a section to detail supporting Kafka 8 2014-07-28 14:46:39 -07:00
Jasmine Hegman 61af84a4a1 Cleaning up code sample indentations 2014-07-28 14:44:59 -07:00
fjy 45e443bedb a few slight tweaks and bumping up curator version 2014-07-25 16:07:40 -07:00
fjy 7e0fa6fe06 Merge branch 'master' of github.com:metamx/druid 2014-07-25 10:50:47 -07:00
fjy bb5c5b3ce7 fix config with broker select and add docs 2014-07-25 10:50:41 -07:00
fjy 41770574f9 Merge pull request #646 from metamx/inverted-topn-metric-spec-docs
add docs
2014-07-25 10:30:38 -06:00
fjy d3b920769d a few more cleanups to docs 2014-07-25 09:26:44 -07:00
Xavier Léauté 9c36014645 remove css from docs 2014-07-24 14:41:45 -07:00
Gian Merlino baeb93772d Rename OrderBy to LimitSpec in docs. 2014-07-24 14:20:43 -07:00
nishantmonu51 27cda43d89 add docs
doc for inverted topN metric spec
2014-07-24 13:16:44 +05:30
fjy 387350abd8 fix toc entry 2014-07-23 13:41:14 -07:00
fjy ded83557dd Merge pull request #640 from metamx/disable-worker
An alternative way to disable middlemanagers based on worker version
2014-07-17 19:07:27 -06:00
fjy 83cb7931ac add more stuff to docs 2014-07-17 14:59:56 -07:00
fjy d765ff5e75 docs for updating 2014-07-17 14:53:26 -07:00
fjy bb5598df54 fix doc 2014-07-17 14:07:12 -07:00
fjy c6078ca841 address code review 2014-07-17 13:34:05 -07:00
fjy bdfeccd092 doc and timeout fix 2014-07-15 15:57:58 -07:00