Merge branch 'master' into upgrade_console_to_0.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/4293a5af Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/4293a5af Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/4293a5af Branch: refs/heads/master Commit: 4293a5af53ebe36e4277a8983bc2d4d6303efb2c Parents: 7778be7 33eeef0 Author: Chris Rohr <[email protected]> Authored: Fri Aug 30 21:09:44 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Fri Aug 30 21:09:44 2013 -0400 ---------------------------------------------------------------------- .../blur/manager/status/QueryStatusManager.java | 4 +- .../blur/thrift/BlurControllerServer.java | 32 ++++++++--- .../blur/thrift/ThriftBlurControllerServer.java | 8 +-- .../java/org/apache/blur/thrift/Connection.java | 23 ++++---- .../org/apache/blur/utils/BlurConstants.java | 3 +- .../src/main/resources/blur-default.properties | 3 + docs/cluster-setup.html | 3 + docs/using-blur.base.html | 58 ++++++++++++++++++++ docs/using-blur.html | 58 ++++++++++++++++++++ 9 files changed, 167 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
