diff --git a/_proto/hapi/release/status.proto b/_proto/hapi/release/status.proto
index ee8c07bb6..2c82effaa 100644
--- a/_proto/hapi/release/status.proto
+++ b/_proto/hapi/release/status.proto
@@ -37,6 +37,8 @@ message Status {
                 FAILED = 4;
                 // Status_DELETING indicates that a delete operation is underway.
                 DELETING = 5;
+                // Status_PENDING indicates that an upgrade/rollback operation is underway.
+                PENDING = 6;
         }
 
         Code code = 1;
diff --git a/pkg/proto/hapi/chart/chart.pb.go b/pkg/proto/hapi/chart/chart.pb.go
index dbb188e91..a884ed552 100644
--- a/pkg/proto/hapi/chart/chart.pb.go
+++ b/pkg/proto/hapi/chart/chart.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/chart.proto
-// DO NOT EDIT!
 
 /*
 Package chart is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/chart/config.pb.go b/pkg/proto/hapi/chart/config.pb.go
index 4a8b36d89..30c652700 100644
--- a/pkg/proto/hapi/chart/config.pb.go
+++ b/pkg/proto/hapi/chart/config.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/config.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go
index 82abb04ff..320ebf73c 100644
--- a/pkg/proto/hapi/chart/metadata.pb.go
+++ b/pkg/proto/hapi/chart/metadata.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/metadata.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/chart/template.pb.go b/pkg/proto/hapi/chart/template.pb.go
index 416269d18..439aec5a8 100644
--- a/pkg/proto/hapi/chart/template.pb.go
+++ b/pkg/proto/hapi/chart/template.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/chart/template.proto
-// DO NOT EDIT!
 
 package chart
 
diff --git a/pkg/proto/hapi/release/hook.pb.go b/pkg/proto/hapi/release/hook.pb.go
index 1724842e3..f7d5419cc 100644
--- a/pkg/proto/hapi/release/hook.pb.go
+++ b/pkg/proto/hapi/release/hook.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/hook.proto
-// DO NOT EDIT!
 
 /*
 Package release is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/release/info.pb.go b/pkg/proto/hapi/release/info.pb.go
index 9485ad058..7a7ccdd74 100644
--- a/pkg/proto/hapi/release/info.pb.go
+++ b/pkg/proto/hapi/release/info.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/info.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go
index 47b321b50..511b543d7 100644
--- a/pkg/proto/hapi/release/release.pb.go
+++ b/pkg/proto/hapi/release/release.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/release.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/status.pb.go b/pkg/proto/hapi/release/status.pb.go
index 0098207a7..8252ec163 100644
--- a/pkg/proto/hapi/release/status.pb.go
+++ b/pkg/proto/hapi/release/status.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/status.proto
-// DO NOT EDIT!
 
 package release
 
@@ -29,6 +28,8 @@ const (
 	Status_FAILED Status_Code = 4
 	// Status_DELETING indicates that a delete operation is underway.
 	Status_DELETING Status_Code = 5
+	// Status_PENDING indicates that an upgrade/rollback operation is underway.
+	Status_PENDING Status_Code = 6
 )
 
 var Status_Code_name = map[int32]string{
@@ -38,6 +39,7 @@ var Status_Code_name = map[int32]string{
 	3: "SUPERSEDED",
 	4: "FAILED",
 	5: "DELETING",
+	6: "PENDING",
 }
 var Status_Code_value = map[string]int32{
 	"UNKNOWN":    0,
@@ -46,6 +48,7 @@ var Status_Code_value = map[string]int32{
 	"SUPERSEDED": 3,
 	"FAILED":     4,
 	"DELETING":   5,
+	"PENDING":    6,
 }
 
 func (x Status_Code) String() string {
@@ -105,24 +108,24 @@ func init() {
 func init() { proto.RegisterFile("hapi/release/status.proto", fileDescriptor3) }
 
 var fileDescriptor3 = []byte{
-	// 291 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xdf, 0x6a, 0xc2, 0x30,
-	0x14, 0xc6, 0x57, 0xad, 0x3a, 0x8f, 0x22, 0x21, 0x1b, 0xac, 0xca, 0x06, 0xc5, 0xab, 0xde, 0xac,
-	0x05, 0xf7, 0x04, 0xdb, 0x12, 0x87, 0xac, 0x54, 0x69, 0x2b, 0xfb, 0x73, 0x53, 0xaa, 0x9e, 0x39,
-	0xa1, 0x34, 0xd2, 0x24, 0x17, 0x7b, 0x88, 0xbd, 0xf3, 0x68, 0x2b, 0x74, 0x5e, 0x7e, 0xf9, 0xfd,
-	0x4e, 0xce, 0xc7, 0x81, 0xf1, 0x77, 0x7a, 0x3c, 0x78, 0x05, 0x66, 0x98, 0x4a, 0xf4, 0xa4, 0x4a,
-	0x95, 0x96, 0xee, 0xb1, 0x10, 0x4a, 0xd0, 0x61, 0x89, 0xdc, 0x13, 0x9a, 0xdc, 0x9d, 0x89, 0x0a,
-	0xa5, 0x4a, 0xa4, 0x3e, 0x28, 0xac, 0xe5, 0xc9, 0x78, 0x2f, 0xc4, 0x3e, 0x43, 0xaf, 0x4a, 0x1b,
-	0xfd, 0xe5, 0xa5, 0xf9, 0x4f, 0x8d, 0xa6, 0xbf, 0x2d, 0xe8, 0x46, 0xd5, 0xc7, 0xf4, 0x1e, 0xcc,
-	0xad, 0xd8, 0xa1, 0x65, 0xd8, 0x86, 0x33, 0x9a, 0x8d, 0xdd, 0xff, 0x1b, 0xdc, 0xda, 0x71, 0x9f,
-	0xc5, 0x0e, 0xc3, 0x4a, 0xa3, 0xb7, 0xd0, 0x2f, 0x50, 0x0a, 0x5d, 0x6c, 0x51, 0x5a, 0x6d, 0xdb,
-	0x70, 0xfa, 0x61, 0xf3, 0x40, 0xaf, 0xa1, 0x93, 0x0b, 0x85, 0xd2, 0x32, 0x2b, 0x52, 0x07, 0x3a,
-	0x87, 0xab, 0x2c, 0x95, 0x2a, 0x69, 0x1a, 0x26, 0x85, 0xce, 0xad, 0x8e, 0x6d, 0x38, 0x83, 0xd9,
-	0xcd, 0xf9, 0xc6, 0x18, 0xa5, 0x8a, 0x4a, 0x25, 0x24, 0xe5, 0x4c, 0x13, 0x75, 0x3e, 0x7d, 0x07,
-	0xb3, 0x6c, 0x42, 0x07, 0xd0, 0x5b, 0x07, 0xaf, 0xc1, 0xf2, 0x2d, 0x20, 0x17, 0x74, 0x08, 0x97,
-	0x8c, 0xaf, 0xfc, 0xe5, 0x07, 0x67, 0xc4, 0x28, 0x11, 0xe3, 0x3e, 0x8f, 0x39, 0x23, 0x2d, 0x3a,
-	0x02, 0x88, 0xd6, 0x2b, 0x1e, 0x46, 0x9c, 0x71, 0x46, 0xda, 0x14, 0xa0, 0x3b, 0x7f, 0x5c, 0xf8,
-	0x9c, 0x11, 0xb3, 0x1e, 0xf3, 0x79, 0xbc, 0x08, 0x5e, 0x48, 0xe7, 0xa9, 0xff, 0xd9, 0x3b, 0x15,
-	0xd8, 0x74, 0xab, 0x0b, 0x3d, 0xfc, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x11, 0x21, 0x30, 0x86,
-	0x01, 0x00, 0x00,
+	// 297 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xc1, 0x6a, 0xf2, 0x40,
+	0x14, 0x85, 0xff, 0x68, 0x8c, 0xbf, 0x57, 0x91, 0x61, 0x5a, 0x68, 0x94, 0x16, 0xc4, 0x95, 0x9b,
+	0x26, 0x60, 0x9f, 0xa0, 0xed, 0x8c, 0x45, 0x1a, 0xa2, 0x24, 0x91, 0xd2, 0x6e, 0x42, 0xd4, 0x5b,
+	0x2b, 0x84, 0x8c, 0x64, 0x66, 0x16, 0x7d, 0x95, 0x3e, 0x6d, 0x99, 0x44, 0x48, 0x5d, 0x9e, 0x7c,
+	0xdf, 0xc9, 0x3d, 0x0c, 0x8c, 0xbe, 0xb2, 0xd3, 0xd1, 0x2f, 0x31, 0xc7, 0x4c, 0xa2, 0x2f, 0x55,
+	0xa6, 0xb4, 0xf4, 0x4e, 0xa5, 0x50, 0x82, 0x0e, 0x0c, 0xf2, 0xce, 0x68, 0x7c, 0x77, 0x21, 0x2a,
+	0x94, 0x2a, 0x95, 0xfa, 0xa8, 0xb0, 0x96, 0xc7, 0xa3, 0x83, 0x10, 0x87, 0x1c, 0xfd, 0x2a, 0x6d,
+	0xf5, 0xa7, 0x9f, 0x15, 0xdf, 0x35, 0x9a, 0xfe, 0xb4, 0xc0, 0x89, 0xab, 0x1f, 0xd3, 0x7b, 0xb0,
+	0x77, 0x62, 0x8f, 0xae, 0x35, 0xb1, 0x66, 0xc3, 0xf9, 0xc8, 0xfb, 0x7b, 0xc1, 0xab, 0x1d, 0xef,
+	0x59, 0xec, 0x31, 0xaa, 0x34, 0x7a, 0x0b, 0xbd, 0x12, 0xa5, 0xd0, 0xe5, 0x0e, 0xa5, 0xdb, 0x9e,
+	0x58, 0xb3, 0x5e, 0xd4, 0x7c, 0xa0, 0xd7, 0xd0, 0x29, 0x84, 0x42, 0xe9, 0xda, 0x15, 0xa9, 0x03,
+	0x5d, 0xc0, 0x55, 0x9e, 0x49, 0x95, 0x36, 0x0b, 0xd3, 0x52, 0x17, 0x6e, 0x67, 0x62, 0xcd, 0xfa,
+	0xf3, 0x9b, 0xcb, 0x8b, 0x09, 0x4a, 0x15, 0x1b, 0x25, 0x22, 0xa6, 0xd3, 0x44, 0x5d, 0x4c, 0x11,
+	0x6c, 0xb3, 0x84, 0xf6, 0xa1, 0xbb, 0x09, 0x5f, 0xc3, 0xd5, 0x5b, 0x48, 0xfe, 0xd1, 0x01, 0xfc,
+	0x67, 0x7c, 0x1d, 0xac, 0xde, 0x39, 0x23, 0x96, 0x41, 0x8c, 0x07, 0x3c, 0xe1, 0x8c, 0xb4, 0xe8,
+	0x10, 0x20, 0xde, 0xac, 0x79, 0x14, 0x73, 0xc6, 0x19, 0x69, 0x53, 0x00, 0x67, 0xf1, 0xb8, 0x0c,
+	0x38, 0x23, 0x76, 0x5d, 0x0b, 0x78, 0xb2, 0x0c, 0x5f, 0x48, 0xc7, 0xd4, 0xd6, 0x3c, 0x64, 0x26,
+	0x38, 0x4f, 0xbd, 0x8f, 0xee, 0x79, 0xcd, 0xd6, 0xa9, 0x9e, 0xeb, 0xe1, 0x37, 0x00, 0x00, 0xff,
+	0xff, 0x2b, 0x97, 0x66, 0xb2, 0x93, 0x01, 0x00, 0x00,
 }
diff --git a/pkg/proto/hapi/release/test_run.pb.go b/pkg/proto/hapi/release/test_run.pb.go
index bd3c0ab2b..4d39d17c2 100644
--- a/pkg/proto/hapi/release/test_run.pb.go
+++ b/pkg/proto/hapi/release/test_run.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/test_run.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/release/test_suite.pb.go b/pkg/proto/hapi/release/test_suite.pb.go
index f168bf1d2..b7fa26147 100644
--- a/pkg/proto/hapi/release/test_suite.pb.go
+++ b/pkg/proto/hapi/release/test_suite.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/release/test_suite.proto
-// DO NOT EDIT!
 
 package release
 
diff --git a/pkg/proto/hapi/rudder/rudder.pb.go b/pkg/proto/hapi/rudder/rudder.pb.go
index 3f64ba713..6e26d71eb 100644
--- a/pkg/proto/hapi/rudder/rudder.pb.go
+++ b/pkg/proto/hapi/rudder/rudder.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/rudder/rudder.proto
-// DO NOT EDIT!
 
 /*
 Package rudder is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go
index d629320c5..023749c4f 100644
--- a/pkg/proto/hapi/services/tiller.pb.go
+++ b/pkg/proto/hapi/services/tiller.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/services/tiller.proto
-// DO NOT EDIT!
 
 /*
 Package services is a generated protocol buffer package.
diff --git a/pkg/proto/hapi/version/version.pb.go b/pkg/proto/hapi/version/version.pb.go
index e3d8a7096..13c8568f0 100644
--- a/pkg/proto/hapi/version/version.pb.go
+++ b/pkg/proto/hapi/version/version.pb.go
@@ -1,6 +1,5 @@
-// Code generated by protoc-gen-go.
+// Code generated by protoc-gen-go. DO NOT EDIT.
 // source: hapi/version/version.proto
-// DO NOT EDIT!
 
 /*
 Package version is a generated protocol buffer package.