Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,964 Commits 112 Branches 504 Tags 710 MiB
Commit Graph

421 Commits

Author SHA1 Message Date
fjy ea9f31bbe0 learn to math and prepare for next release 2014-04-02 21:31:17 -07:00
fjy f185d215e1 fix jetty default thread pool size for jetty 9 and prepare for next release 2014-04-02 21:01:07 -07:00
fjy fc94b847c3 prepare for next release 2014-04-02 17:31:19 -07:00
Igal Levy ba6c289ccb minor typos fixed 2014-03-31 13:05:54 -07:00
Igal Levy adfcc3d16f Merge branch 'master' into igalDruid 2014-03-27 16:19:58 -07:00
Igal Levy 0f4e5cb125 added firehose and plumber sections, which were being referenced but were missing 2014-03-27 16:18:56 -07:00
Igal Levy 2245764b8f added link to info on rejection policy 2014-03-27 15:16:47 -07:00
Igal Levy effd30f991 added link to info on how tasks are posted 2014-03-27 15:12:50 -07:00
Igal Levy de771a6642 edits for readability 2014-03-27 15:09:42 -07:00
Igal Levy fa0f0a810c removed references to config elements that do not appear on the page 2014-03-27 15:00:28 -07:00
Igal Levy 525cbf5aab completed config info with rjection policy, segmentGranularity; some minor edits 2014-03-27 14:58:40 -07:00
nishantmonu51 298b9c9346 update default version in docs 2014-03-27 20:16:49 +05:30
fjy 183a133ee4 Merge pull request #442 from metamx/demo-paper 
Writing a demonstration paper for a conference
 2014-03-25 22:29:36 -06:00
fjy 15af9ac3c5 fix things 2014-03-25 21:26:48 -07:00
Igal Levy 24dbc58cec edited for flow and readability 2014-03-25 17:19:55 -07:00
Igal Levy 5ff77dad34 Merge branch 'master' into igalDruid 2014-03-25 16:56:24 -07:00
Igal Levy 7881f068c6 added task types that were missing from some of the JSON task configs 2014-03-25 16:53:06 -07:00
Igal Levy 8859aa675a fixed link text to realtime ingestion 2014-03-25 16:43:58 -07:00
Igal Levy d780b28a09 added link for more info on indexGranularity 2014-03-25 16:25:00 -07:00
Igal Levy 5eacd97239 fixed typo in task spec 2014-03-24 16:51:11 -07:00
Michael E. Driscoll 98cd83071a Update index.md 
Fixed a few typos and grammatical issues.
 2014-03-23 14:58:11 -07:00
fjy 55169175de prepare for next release 2014-03-21 11:05:54 -07:00
Igal Levy a64be537a5 updated task ID definition 2014-03-19 21:08:40 -07:00
Guillaume Simard 1b20188ec7 Merge 2014-03-18 17:12:49 -04:00
Igal Levy c4d06faa05 Merge branch 'master' into igalDruid 2014-03-18 11:00:10 -07:00
Igal Levy 04040ef75f Fixed: 
- Bad link for granularitySpec changed to real definition.
- All heads set to logical levels (consistent with all others).
- Fixed bad link in definition for spatialDimensions.
 2014-03-18 10:28:33 -07:00
fjy 804a4051fa prepare for next rel 2014-03-18 08:10:59 -07:00
fjy 1d1ec1d855 clean up some defaults and prepare for next release 2014-03-17 21:41:34 -07:00
fjy 2adcf07f5f Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/main/java/io/druid/indexer/DetermineHashedPartitionsJob.java
	indexing-service/src/main/java/io/druid/indexing/common/task/RealtimeIndexTask.java
	indexing-service/src/test/java/io/druid/indexing/common/task/TaskSerdeTest.java
	processing/src/test/java/io/druid/segment/TestIndex.java
	server/src/main/java/io/druid/segment/realtime/RealtimeManager.java
	server/src/main/java/io/druid/segment/realtime/plumber/RealtimePlumberSchool.java
 2014-03-17 10:59:31 -07:00
fjy f1da044cfa fix another breaking endpoint in druid coordinator 2014-03-14 15:15:08 -07:00
fjy f525361c3d fix broken tests and prepare for next release 2014-03-14 15:05:07 -07:00
fjy f0fdfbb2f7 fix broken constant post agg 2014-03-14 14:54:52 -07:00
fjy b3fb2fea9c prepare for next release 2014-03-14 10:57:43 -07:00
fjy 6844063a52 fix broken examples 2014-03-14 10:56:27 -07:00
fjy b4f1591260 clean up examples, finish paper 2014-03-13 18:52:08 -07:00
Igal Levy 71818288e2 syntax and grammar fixes; tightened up language and flow 2014-03-13 17:55:45 -07:00
Igal Levy a8820bd3a0 Merge branch 'master' into igalDruid 2014-03-13 17:44:43 -07:00
fjy ae2dc6506c fix broken granularity 2014-03-10 15:03:43 -07:00
fjy 243af486cf prepare for next release 2014-03-10 13:24:53 -07:00
fjy 228cfa95bd Merge pull request #371 from N3TWORK/subquery 
Subquery functionality for Group By queries
 2014-03-07 13:41:56 -07:00
Yuval Oren 4b63645802 Merge branch 'master' into subquery 
Conflicts:
	processing/src/main/java/io/druid/query/BaseQuery.java
	processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
	processing/src/test/java/io/druid/query/QueryRunnerTestHelper.java
	processing/src/test/java/io/druid/query/topn/TopNQueryRunnerTest.java
 2014-03-06 13:33:59 -08:00
fjy e1fac64298 prepare for next release 2014-03-06 12:53:05 -08:00
fjy 08138688e4 port hyperunique to open source 2014-03-05 14:19:38 -08:00
Igal Levy b6d9619db0 fixed markdown rendering issue (literal '<' are interpreted) 2014-03-04 16:14:19 -08:00
fjy 0e8e527662 Merge branch 'master' into new-schema 2014-03-04 14:42:16 -08:00
Igal Levy 916bd30db3 fixed link to Cassandra article 2014-03-04 11:44:06 -08:00
Igal Levy a73b4afc4b added note+link about Cassandra option 2014-03-04 11:41:05 -08:00
Igal Levy f9f9b30709 fixed minor typo 2014-03-04 11:40:35 -08:00
fjy 0feddc3831 Merge pull request #411 from metamx/small-fixes-docs-searchquery-limit 
Small fixes
 2014-03-04 10:30:27 -07:00
fjy 46b9ac78e7 Merge branch 'master' into new-schema 
Conflicts:
	indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java
	pom.xml
	publications/whitepaper/druid.pdf
	publications/whitepaper/druid.tex
 2014-03-03 14:48:15 -08:00
nishantmonu51 5603da189d fix #405 update cluster setup doc 
rename old names to new ones
 2014-02-28 13:02:05 +05:30
Igal Levy 95c491db0f fixed broken link 2014-02-26 17:37:52 -08:00
Igal Levy 0721220772 Merge branch 'master' into igalDruid 2014-02-26 17:36:48 -08:00
nishantmonu51 8af63005a6 refactor randomPartitionsSpec to hashedPartitionsSpec 
refactor to a more appropriate name
 2014-02-25 03:07:31 +05:30
Igal Levy 21299a6f81 refactored hadoop intro since the replacement page for instructions also wasn't right and there are quite a few available that are right 2014-02-21 10:43:52 -08:00
Igal Levy d3a1041e49 fixed broken url to other tutorial 2014-02-20 09:52:25 -08:00
Igal Levy 723f1427eb fixed broken url to hadoop setup instructions 2014-02-20 09:50:44 -08:00
Igal Levy 7aadef8e76 minor edits for clarity 2014-02-19 21:20:07 -08:00
fjy 20cac8c506 not compiling yet but close 2014-02-19 15:54:27 -08:00
Igal Levy 75ae4d434d added advice about restarting zk and mysql if not already running 2014-02-19 15:28:48 -08:00
fjy fb93448e9d prepare for next release because my last one failzored out of bad internetz 2014-02-14 15:22:27 -08:00
fjy 1a8f9f2e12 prepare for next release 2014-02-14 15:07:44 -08:00
fjy 3979eb270c Revert "Revert "Merge branch 'determine-partitions-improvements'"" 
This reverts commit 189b3e2b9b.
 2014-02-14 12:58:56 -08:00
fjy 189b3e2b9b Revert "Merge branch 'determine-partitions-improvements'" 
This reverts commit 7ad228ceb5, reversing
changes made to 9c55e2b779.
 2014-02-14 12:47:34 -08:00
Igal Levy 5ee776db64 fixed broken link 2014-02-13 16:39:44 -08:00
Igal Levy 0714800904 Merge branch 'master' into igalDruid 2014-02-13 16:38:09 -08:00
fjy a986166b9c prepare for next release 2014-02-12 20:01:05 -08:00
Igal Levy 9313c7f511 minor tweaking to clarify instructions for csv and tsv 2014-02-12 18:59:35 -08:00
nishantmonu51 7ad228ceb5 Merge branch 'determine-partitions-improvements' 
Conflicts:
	pom.xml
 2014-02-12 10:51:26 +05:30
Gian Merlino 38e9a79560 Fix typo 2014-02-08 15:07:01 -08:00
fjy 2497bd2e85 prepare for next release 2014-02-07 13:04:34 -08:00
fjy c8b350270f prepare for next release 2014-02-07 11:54:56 -08:00
fjy 0fd95bc2b4 refactor out the configuration docs 2014-02-07 11:35:44 -08:00
nishantmonu51 48d0c37f98 documentation for random partition spec 2014-02-05 15:30:44 +05:30
Yuval Oren 689191c5ad Merge branch 'master' into subquery 2014-02-03 14:52:50 -08:00
Mike Vincent 5a152f8b1f Link Data Formats document and format spec references 2014-02-02 19:47:55 -06:00
Igal Levy 3a980b8a68 Merge branch 'master' into igalDruid 
Resolve conflict in first tutorial.
Conflicts:
	docs/content/Tutorial:-The-Druid-Cluster.md
 2014-01-28 09:35:39 -08:00
Guillaume Simard 624b13e8f5 Fixed JSON 2014-01-28 11:04:19 -05:00
GuiSim 374904ce20 Removed trailing comma 2014-01-28 10:34:13 -05:00
GuiSim 9831401c7d missing word 2014-01-28 10:17:49 -05:00
GuiSim 8d024a5e9a typo fix 2014-01-28 09:56:38 -05:00
Igal Levy 01e8d9e0a0 fixed typo 2014-01-27 17:29:49 -08:00
Igal Levy 1bca1c47b7 creating a doc to cover ingestion of csv and tsv formats 2014-01-27 17:29:05 -08:00
Yuval Oren 1c0b818cb2 Merge branch 'master' into subquery 2014-01-27 14:57:14 -08:00
GuiSim 929e6be8e9 text cleanup 2014-01-27 17:28:59 -05:00
fjy 74dd855a45 fix spelling 2014-01-28 05:50:23 +08:00
Yuval Oren c99e468ccd Merge branch 'master' into subquery 2014-01-24 16:48:35 -08:00
Igal Levy 06b73b366a minor rewriting for flow; fixed some wrong links 2014-01-24 16:48:19 -08:00
Yuval Oren 8f39981fab Documentation for query data sources 2014-01-24 16:12:10 -08:00
fjy 0c789412bb add a workaround for jackson bug where jacksoninject fails when a null value is passed through json creator annotated constructor 2014-01-25 07:07:27 +08:00
Igal Levy 3301d5d510 added a little padding to table cells to improve look and readablity 2014-01-24 13:14:56 -08:00
Igal Levy 5aacfe72e1 minor corrections and edits for flow 2014-01-24 12:26:38 -08:00
Igal Levy 0c16f24ba1 added note about slow start first time around due to fetching of dependencies 2014-01-21 11:03:07 -08:00
Igal Levy 010abf2552 fixed typo 2014-01-21 10:05:03 -08:00
Igal Levy 53f69c5791 updated to not refer to old wiki 2014-01-20 17:12:36 -08:00
fjy e2ea2ec7fd Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
 2014-01-20 15:10:13 -08:00
fjy 215584891e Merge branch 'master' into moar-endpoints 2014-01-20 13:06:45 -08:00
fjy 3cba0c8ff2 more endpoints for getting info out of druid 2014-01-17 17:52:27 -08:00
fjy f898c29e20 fix batch indexing and prepare for next release 2014-01-17 15:52:04 -08:00
Igal Levy 53b6392dce added titles; fixed a few typos 2014-01-16 15:37:07 -08:00
Igal Levy 6e880f8b24 tweaked naming 2014-01-16 15:16:04 -08:00
fjy 0ceda034cd fix dependency issue and prepare for next release 2014-01-14 17:34:02 -08:00
fjy 187bb84b45 prepare for next release 2014-01-14 16:07:05 -08:00
fjy 9184906c39 prepare for next release 2014-01-14 09:54:42 -08:00
fjy e8d61ffe99 prepare for next release 2014-01-13 18:02:24 -08:00
fjy 3b17c4c03c a whole bunch of docs and fixes 2014-01-13 18:01:56 -08:00
fjy f4e3f02c3b more exceptions 2014-01-10 18:06:42 -08:00
Igal Levy 8196bf5dde added link to manually download druid 0.5.x 2014-01-10 17:20:53 -08:00
Igal Levy 58c8fcc519 added note about support for druid 0.5.x only 2014-01-10 16:29:33 -08:00
Igal Levy 917b4ea5ce Merge branch 'master' into igalDruid 2014-01-10 16:19:20 -08:00
fjy fe50104053 fix the index task and more docs 2014-01-10 14:47:18 -08:00
Igal Levy 8c2bffc1a6 final draft 2014-01-10 14:45:38 -08:00
fjy f123a14373 Merge branch 'master' into az 
Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
 2014-01-09 19:09:38 -08:00
Igal Levy 2ddf3c4ef6 first stab at overhauling this doc to bring it up to date 2014-01-09 15:44:54 -08:00
Xavier Léauté 84273d4fc2 add docs 2014-01-09 15:18:40 -08:00
fjy 81cdf1b6d0 Merge pull request #340 from metamx/igalDruid 
Igal druid
 2014-01-08 18:39:00 -08:00
fjy 96caf2d518 Merge branch 'master' into az 2014-01-08 16:23:05 -08:00
fjy 90f3056fce clean up doc 2014-01-08 16:10:48 -08:00
fjy 50a6839693 inital commit of topNs 2014-01-08 15:51:03 -08:00
fjy e11952f3b6 bridge is kinda working for mastery stuff right now, tests pass 2014-01-06 17:01:50 -08:00
fjy 488a118f3f Merge branch 'master' into az 2014-01-02 10:53:37 -08:00
Igal Levy 5efca6eea8 Merge branch 'master' into igalDruid 2013-12-20 13:45:16 -08:00
Igal Levy 39012c6dbe Separated realitme ingestion from realtime node info; under Data Ingestion the Realtime link now points to the new realtime-ingestion page 2013-12-20 13:43:55 -08:00
Igal Levy 9b53912209 Added titles 2013-12-20 13:42:22 -08:00
Igal Levy 3d66f0fb8b added Realtime-ingestion under Data Ingestion (this is the content split from Realtime, which is now just about the node); moved Firehose and Plumber under Realtime-ingestion 2013-12-20 13:08:25 -08:00
Igal Levy d283693d78 updated links and references since these two files contain the lists of firehoses and plumbers they refer to, and pointed to Realtime-ingestion for the example of the kafka firehose 2013-12-20 13:04:40 -08:00
Gian Merlino bbe1b82347 Update versions 2013-12-20 12:26:27 -08:00
Gian Merlino 4bc8ff4d6a Update versions 2013-12-20 11:19:36 -08:00
Igal Levy 721195ac12 added anchor for linking to section 2013-12-19 17:26:51 -08:00
Igal Levy 18d8b0840e fixed formatting on numbered list and code blocks 2013-12-19 16:07:57 -08:00
Igal Levy 0aa04dd787 added title 2013-12-19 16:04:56 -08:00
Igal Levy 479b953a79 added definitions for master and compute nodes; tweaked spacing between term and definition 2013-12-18 17:35:30 -08:00
fjy 9b8134c73e Merge branch 'master' into az 2013-12-18 15:44:43 -08:00
Gian Merlino fc4dd51194 Update versions 2013-12-18 15:33:25 -08:00
Xavier Léauté 892a42bafe fix docs config casing 2013-12-18 14:37:27 -08:00
fjy d112b2d211 prepare for next release 2013-12-17 17:47:04 -08:00
fjy 07875dd30b prepare for next release 2013-12-17 16:28:11 -08:00
Xavier Léauté 178c26f9f7 fix naming and docs 2013-12-16 16:50:31 -08:00
fjy f2241c8885 prepare for next release 2013-12-16 16:16:00 -08:00
gianm bc4a7349d1 Merge pull request #303 from metamx/s3-storage-archiving 
S3 Storage: moving and archiving of unused segments
 2013-12-16 16:02:18 -08:00
fjy 2c7a6d26b3 fix typo in tutorial 2013-12-16 15:55:28 -08:00
fjy 27bba22e6f make rules assignable across tiers 2013-12-16 15:54:42 -08:00
fjy e309f48357 Merge branch 'master' into az 
Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
 2013-12-16 14:57:54 -08:00
Xavier Léauté bb1b037f87 fix docs 2013-12-16 13:59:16 -08:00
Xavier Léauté e38f2877fb default to archiving segments + docs 2013-12-16 13:59:15 -08:00
fjy 2dd4860106 fix typo 2013-12-13 17:08:29 -08:00
fjy 87b83bceb1 fix task storage config serde and prepare for next release 2013-12-13 16:55:22 -08:00
fjy 01f9c1df31 fix broken task storage config and prepare for next release 2013-12-13 16:45:32 -08:00
fjy 9a5fd6b0e9 prepare for next release 2013-12-13 16:18:34 -08:00
fjy 52cdb20f10 add better messaging and error handling 2013-12-13 15:01:07 -08:00
fjy ca7335f45f things dont work 2013-12-13 13:35:22 -08:00
fjy 407f8caf94 remove server monitor from list of default monitors 2013-12-13 09:04:32 -08:00
fjy 25ebba2c38 fix default start delay of indexing service and prepare for next release 2013-12-12 18:51:25 -08:00
fjy 19eafe0e96 prepare for next release 2013-12-12 17:26:50 -08:00
fjy a58f90a689 prepare for next release 2013-12-12 14:51:14 -08:00
fjy 6eb1102f95 Merge pull request #320 from metamx/igalDruid 
Igal druid
 2013-12-12 14:45:28 -08:00
Gian Merlino 81ccb37019 Indexing-Service.md: New overlord-related configs. 2013-12-12 11:46:56 -08:00
Gian Merlino 58d8f0046a Configuration.md: Update TaskLogs docs 2013-12-12 11:46:30 -08:00
Igal Levy 476ce8677d Merge branch 'master' into igalDruid 2013-12-11 09:17:30 -08:00
Igal Levy 60577a6e24 adjusted size of first section head to match others 2013-12-11 09:16:49 -08:00
fjy 6cc0860657 fix s3 module problems and prepare for next release 2013-12-09 20:05:55 -08:00
fjy ab1f02b2bc fix version brokenness and prepare for next release 2013-12-09 18:38:22 -08:00
fjy 976affb3af prepare for next release 2013-12-09 18:28:31 -08:00
Igal Levy fcc8801b13 added title 2013-12-09 16:11:06 -08:00
Igal Levy 19be4f8bb0 Refactored modules section for better flow/readability and added link to extending druid 2013-12-09 16:08:14 -08:00
Igal Levy 0e3378e5cd refactored sidebar sections to group related topics together under a section that encompasses what they are about, and communicates to a user that this is the go-to section for provisioning/deploying etc. a druid cluster 2013-12-09 15:17:56 -08:00
Igal Levy ddbab46ace added title; fixed link to configuration 2013-12-09 14:03:29 -08:00
Igal Levy 84234b142d added title; minor typo fixes 2013-12-09 13:21:57 -08:00
fjy 77fec83b59 clean up znode def 2013-12-09 11:25:58 -08:00
fjy b7e8a83fcb Merge pull request #318 from metamx/minor-fixes 
Minor fixes and documentation changes
 2013-12-09 10:30:13 -08:00
nishantmonu51 2186bd6cb7 Minor fixes and documentation changes 2013-12-09 19:07:48 +05:30
Igal Levy 97ebad39be Merge branch 'master' into igalDruid 2013-12-04 20:42:23 -08:00
Igal Levy 0b7664f639 added titles since there is no other indication other than URL as to which page has been selected from the left-side nav menu 2013-12-04 20:41:25 -08:00
fjy fbad1e2d7a fix convert properties with infoPath and prepare for next release 2013-12-04 18:55:35 -08:00
fjy 929b2336a9 fix non deterministic behaviour in test 2013-12-02 17:02:24 -08:00
fjy 05f72601c4 fix request time metric and prepare for next release 2013-12-02 14:20:59 -08:00
Igal Levy f36d72642d fixed typo 2013-11-27 12:30:05 -08:00
Igal Levy 8d6bd27129 updated definition of ephemeral node 2013-11-27 12:28:41 -08:00
Igal Levy 4e1e5579a1 added definition for ephemeral node, a ZK concept that occurs in the docs 2013-11-27 12:13:31 -08:00
Igal Levy ab30d068b4 update process flow diagram to be correct 2013-11-27 11:58:26 -08:00
fjy de0d6e2264 Merge pull request #308 from metamx/javascript-dimextractionfn 
Javascript DimExtractionFn
 2013-11-27 11:47:07 -08:00
Xavier Léauté 78a8206ee6 add docs on hadoop flavors and hadoop index task classpath resolution 2013-11-26 17:08:08 -08:00
Igal Levy bcea0f6ca0 update sidebar to remove 'Contents' which looked like it applied to one section only, whereas it's all contents 2013-11-26 17:03:07 -08:00
Igal Levy 74bb8f1cc1 fixed formatting re bullets preceded by html <a> tag 2013-11-26 16:30:32 -08:00
fjy 5524cb7608 remove extra contents in toc 2013-11-25 18:34:53 -08:00
fjy ddb6e83f17 fix realtime default and prepare for next deploy 2013-11-25 17:53:17 -08:00
Igal Levy 9750537d61 Merge branch 'master' into igalDruid 2013-11-25 13:00:46 -08:00
fjy f98b6bb0d2 Merge pull request #310 from hkmurakami/master 
fix broken links in documentation
 2013-11-25 12:46:09 -08:00
hkmurakami eed215e53e Rename Druid-vs-vertica.md to Druid-vs-Vertica.md 
links in documentation point to capitalized version (http://druid.io/docs/0.6.10/)
 2013-11-23 13:13:46 -08:00
hkmurakami 964bff065a Rename Druid-vs-redshift.md to Druid-vs-Redshift.md 
links in documentation point to capitalized version. (http://druid.io/docs/0.6.10/)
 2013-11-23 13:13:05 -08:00
hkmurakami be5ce88093 fix header formatting in tutorial doc 2013-11-23 12:57:51 -08:00
Xavier Léauté 60fddfb67e add DimensionSpecs docs 2013-11-22 16:33:25 -08:00
Xavier Léauté 40af9df0d4 fix search doc links and code 2013-11-22 16:33:16 -08:00
Igal Levy c71c33ed69 * removed terms that are widespread -- such as "column" and "interval" -- since there are too many ways to define them, in favor of allowing them to be defined in context on pages where they occur. For example, "interval" shows up in the JSON blob containing segment metadata, as well as in queries. 
* removed sections -- it's hard for a new user to understand exactly why these terms are in those sections, or what that means, so better to allow specific definitions or the context in pages to impart those relationships.
* Added links between entries
 2013-11-21 15:10:44 -08:00
Igal Levy 9d36b9962c fixed awkward wording 2013-11-21 11:08:26 -08:00
Igal Levy b645eb19b5 Refactor to remove sections and order entries. 2013-11-21 11:04:22 -08:00
Igal Levy a3b60557e2 Refactored with new and updated sections and definitions. 2013-11-20 21:32:41 -08:00
Igal Levy 639d769337 Merge branch 'master' into igalDruid 2013-11-20 21:32:01 -08:00
fjy fbb65988bd make query resource eagerly instantiate and prepare for next release 2013-11-20 11:58:25 -08:00
fjy c234dafee1 prepare for next release 2013-11-20 10:43:37 -08:00