Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/ad1cdba6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/ad1cdba6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/ad1cdba6 Branch: refs/heads/master Commit: ad1cdba6a3b510a597445df1fa9685e8a1b5df26 Parents: 8e05c83 453a0dd Author: Aaron McCurry <[email protected]> Authored: Wed Sep 18 20:34:14 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Sep 18 20:34:14 2013 -0400 ---------------------------------------------------------------------- .../blur/thrift/BlurControllerServer.java | 19 ++++--- .../blur/shell/CreateSnapshotCommand.java | 37 ++++++++++++++ .../apache/blur/shell/ListSnapshotsCommand.java | 52 ++++++++++++++++++++ .../main/java/org/apache/blur/shell/Main.java | 5 +- .../blur/shell/RemoveSnapshotCommand.java | 35 +++++++++++++ 5 files changed, 141 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
