Merge pull request #355 from influxdata/ross-build-fix

Prevent an rc in the version tag from preventing a nightly build
influxdata · Mar 18, 2016 · 84a3739 · 84a3739
2 parents 572ed63 + 7f2c862
commit 84a3739
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/build.py b/build.py
@@ -745,8 +745,8 @@ def main():
             return 1
 
     if nightly and rc:
-        print "!! Cannot be both nightly and a release candidate! Stopping."
-        return 1
+        # If nightly is specified, reset rc to None
+        rc = None
 
     if nightly:
         # In order to cleanly delineate nightly version, we are adding the epoch timestamp