Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into ds-253

  • Loading branch information...
commit 0bf466f95ecf869f07f3583e11ddd17a3470cbf5 2 parents 2e9acca + 32640b7
@stuhood stuhood authored
View
2  VERSION
@@ -1 +1 @@
-0.17.3
+0.17.4
View
4 gizzmo.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{gizzmo}
- s.version = "0.17.3"
+ s.version = "0.17.4"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Kyle Maxwell"]
- s.date = %q{2012-05-02}
+ s.date = %q{2012-05-03}
s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
s.email = %q{stuhood@twitter.com}
s.executables = ["setup_shards", "gizzmo"]
View
2  lib/gizzard/commands.rb
@@ -1268,7 +1268,7 @@ def run
end
# fetch a preview of the batch
- batch, might_have_more_batches = fetch_and_truncate(rl, 32)
+ batch, might_have_more_batches = fetch_and_truncate(rl, 1024)
puts "Rolling back #{rl.name} will execute the following operations:"
if might_have_more_batches
head_id = batch.first.first
View
4 lib/gizzard/thrift.rb
@@ -32,10 +32,10 @@ def <=>(o)
alias_method :to_unix, :inspect
def self.parse(string)
- if groups = string.match(/(.*)\/(.*\d+_\d{3,}.*)/)
+ if groups = string.match(/(.*)\/(.*_\d{3,}.*)/)
new(*groups.values_at(1, 2))
else
- raise "Invalid shard id '#{string}': shard ids are composed of '<table-prefix>_<table-id>_<three-or-more-digit-id>[_<optional-suffix>]'"
+ raise "Invalid shard id '#{string}': shard ids are composed of '<table-prefix>_<three-or-more-digit-id>[_<optional-suffix>]'"
end
end
end
View
2  lib/gizzmo.rb
@@ -489,7 +489,7 @@ def add_template_opts(subcommand_options, opts)
end
end,
'log-rollback' => OptionParser.new do |opts|
- opts.banner = "Usage: #{zero} --rollback-log=LOG_NAME log-rollback"
+ opts.banner = "Usage: #{zero} log-rollback LOG_NAME"
separators(opts, DOC_STRINGS["log-rollback"])
end,
}
View
2  test/nameserver_spec.rb
@@ -17,6 +17,8 @@
parse_should("localhost", "edges_134_134_replicating")
parse_should("localhost", "writeonly_edges_backward_134_134")
parse_should("localhost", "writeonly_edges_forward_134_134")
+ parse_should("localhost", "status_1833_replicating")
+ parse_should("localhost", "status_1833")
end
def parse_should(hostname, table_prefix)
Please sign in to comment.
Something went wrong with that request. Please try again.