Merge branch 'bug972' of git://github.com/jollyroger/buildbot

* 'bug972' of git://github.com/jollyroger/buildbot:
  Fixing conflicting command-line options.

master/NEWS

@@ -10,6 +10,15 @@ This sets the number of changes that buildbot will keep in memory at once.
 Users of distributed version control systems should consider setting this to a
 high value (e.g. 10,000)
 
+** Command-line options changed
+
+To resolve conflicting command-line options (ticket #972) for sendchange
+command the following changes were done:
+
+ * `-m` option now means `--master`
+ * `-c` option now means `--comments`
+ * `-C` option now means `--category`
+
 ** Required Jinja Version
 
 The Buildmaster now requires Jinja-2.1 or higher.

master/buildbot/scripts/runner.py

@@ -766,12 +766,12 @@ def __init__(self):
         ("repository", "R", None, "Repository specifier"),
         ("project", "P", None, "Project specifier"),
         ("branch", "b", None, "Branch specifier"),
-        ("category", "c", None, "Category of repository"),
+        ("category", "C", None, "Category of repository"),
         ("revision", "r", None, "Revision specifier"),
         ("revision_file", None, None, "Filename containing revision spec"),
         ("property", "p", None,
          "A property for the change, in the format: name:value"),
-        ("comments", "m", None, "log message"),
+        ("comments", "c", None, "log message"),
         ("logfile", "F", None,
          "Read the log messages from this file (- for stdin)"),
         ("when", "w", None, "timestamp to use as the change time"),