github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,573 Commits 1 Branch 31 Tags 1,019 MiB
d3fdc61ff7
Commit Graph

1790 Commits

Author SHA1 Message Date
k8s-merge-robot
c458cd7bb7 Merge pull request #18379 from deads2k/gv-newobject 
Auto commit by PR queue bot
 2015-12-13 13:33:16 -08:00
k8s-merge-robot
47d2f41680 Merge pull request #18370 from deads2k/gv-interfacesfor 
Auto commit by PR queue bot
 2015-12-13 10:27:17 -08:00
harry
d94945c179 Fix empty string check inconsistency in validation.go 2015-12-13 00:11:56 +08:00
mqliang
a21dd8a32b replace OsImage to OSImage 2015-12-12 15:53:34 +08:00
Jeff Lowdermilk
f6686ba3a4 Merge pull request #18290 from wojtek-t/fast_namespace_deletion 
Support collection deletion in apiserver.
 2015-12-11 13:34:56 -08:00
Jeff Lowdermilk
9c49cdaa6e Merge pull request #18276 from thockin/airplane_validation_pt6 
Validation cleanup parts 5 & 6 together
 2015-12-11 13:34:37 -08:00
deads2k
ec87d74ecb update InterfacesFor to use GroupVersion 2015-12-11 13:45:41 -05:00
k8s-merge-robot
90b5db167f Merge pull request #18356 from deads2k/make-broken-test-correct 
Auto commit by PR queue bot
 2015-12-11 00:34:15 -08:00
Tim St. Clair
b4116eb718 Handle nil Amount in resource.Quantity.{Add,Sub} 
Treat `nil` Amount as 0 in `resource.Quantity.Add` and
`resource.Quantity.Sub`. Also, allow adding/subtracting resources with
different Formats (since Format has no effect on the underlying value).
 2015-12-10 19:24:23 -08:00
Kris
ca7c765f0a Remove APIStatus from the client 
Everything that used it also depended on pkg/api/errors. It was a
needless abstraction since it was always an *errors.StatusError.
 2015-12-10 13:12:21 -08:00
Tim Hockin
872faffdac Internal errors are internal 2015-12-10 11:48:19 -08:00
Tim Hockin
7fb8f60735 Shorten names for better reading 2015-12-10 11:48:19 -08:00
Tim Hockin
87a35047dd Move FieldPath and errors to a sub-package 
This makes the naming and reading a lot simpler.
 2015-12-10 11:48:16 -08:00
Timothy St. Clair
a428246960 Abstract the error handling for the storage layer to eliminate the 
direct etcd dependency.
 2015-12-10 08:06:19 -06:00
Wojciech Tyczynski
2ef5e320db Fix node events 2015-12-10 09:52:33 +01:00
Wojciech Tyczynski
f28bb68d8c Support collection deletion in apiserver. 2015-12-10 09:46:25 +01:00
Clayton Coleman
1e21054134 Hide common codec methods under helpers 
The pending codec -> conversion split changes the signature of
Encode and Decode to be more complicated. Create a stub helper
with the exact semantics of today and do the simple mechanical
refactor here to reduce the cost of that change.
 2015-12-09 21:15:02 -05:00
k8s-merge-robot
5f7019ab9d Merge pull request #16877 from anish/iscsi_iface 
Auto commit by PR queue bot
 2015-12-09 11:52:37 -08:00
Wojciech Tyczynski
029d906074 Merge pull request #18170 from xiang90/scale 
api/resource: optimize scale function
 2015-12-09 16:18:28 +01:00
deads2k
7118f90eff update test to pass properly and reflect actual behavior 2015-12-09 09:12:44 -05:00
deads2k
519b4e80d1 update NewObject for groupversionkind 2015-12-09 08:13:15 -05:00
k8s-merge-robot
8d633458cd Merge pull request #18148 from feihujiang/addEnumTypeForStatusReansonConstants 
Auto commit by PR queue bot
 2015-12-09 03:35:55 -08:00
k8s-merge-robot
85789f319f Merge pull request #18103 from deads2k/gv-remove-groupmetaVersion 
Auto commit by PR queue bot
 2015-12-08 23:31:52 -08:00
Anish Bhatt
6e46fa1fd4 Add support for open-iscsi transports. 
This enables use of software or hardware transports viz. be2iscsi,
bnx2i, cxgb3i, cxgb4i, qla4xx, iser and ocs. The default transport
(tcp) happens to be called "default".

Use of non-default transports changes the disk path to the following format:
/dev/disk/by-path/pci-<pci_id>-ip-<portal>-iscsi-<iqn>-lun-<lun_id>
 2015-12-08 17:28:06 -08:00
deads2k
2ee3dfe415 update testapi to eliminate redundant fields 2015-12-07 15:54:26 -05:00
k8s-merge-robot
ec1ba7438f Merge pull request #17796 from deads2k/gv-object-typer 
Auto commit by PR queue bot
 2015-12-07 12:34:55 -08:00
k8s-merge-robot
dc4bc2a566 Merge pull request #18024 from deads2k/gv-kubectl02 
Auto commit by PR queue bot
 2015-12-07 11:47:40 -08:00
deads2k
66eecb963a update more kubectl bits for groupversion 2015-12-07 09:01:44 -05:00
deads2k
3f045cf168 udpate admission for API groups 2015-12-07 08:55:01 -05:00
deads2k
f764e0099c Update ObjectTyper to GroupVersion 2015-12-07 08:35:05 -05:00
k8s-merge-robot
810181fb7b Merge pull request #17278 from ZJU-SEL/fix-nil-tag 
Auto commit by PR queue bot
 2015-12-06 12:52:39 -08:00
k8s-merge-robot
c6b59353e1 Merge pull request #18022 from deads2k/gv-request 
Auto commit by PR queue bot
 2015-12-05 22:38:40 -08:00
Clayton Coleman
9fea762917 Add protobuf preparation objects, guarded by proto tag 2015-12-05 18:15:48 -05:00
Jordan Liggitt
7d10fd3591 Validate pod spec.nodeName 2015-12-05 11:34:09 -05:00
derekwaynecarr
54f5bb393b Fix missing field selector conversions in v1 2015-12-04 15:43:05 -05:00
Xiang Li
cf82d6b004 resource: optimize scale function 
The original scale function takes around 800ns/op with more
than 10 allocations. It significantly slow down scheduler
and other components that heavily relys on resource pkg.
For more information see #18126.

This pull request tries to optimize scale function. It takes
two approach:

1. when the value is small, only use normal math ops.
2. when the value is large, use math.Big with buffer pool.

The final result is:

BenchmarkScaledValueSmall-4	20000000	        66.9 ns/op	       0 B/op	       0 allocs/op
BenchmarkScaledValueLarge-4	 2000000	       711 ns/op	      48 B/op	       1 allocs/op

I also run the scheduler benchmark again. It doubles the throughput of
scheduler for 1000 nodes case.
 2015-12-03 17:00:13 -08:00
Tim Hockin
e6df0b1a24 Convert validation to use FieldPath 
Before this change we have a mish-mash of ways to pass field names around for
error generation.  Sometimes string fieldnames, sometimes .Prefix(), sometimes
neither, often wrong names or not indexed when it should be.

Instead of that mess, this is part one of a couple of commits that will make it
more strongly typed and hopefully encourage correct behavior.  At least you
will have to think about field names, which is better than nothing.

It turned out to be really hard to do this incrementally.
 2015-12-03 08:19:44 -08:00
k8s-merge-robot
c5924d20a5 Merge pull request #17817 from mqliang/eventtype 
Auto commit by PR queue bot
 2015-12-03 05:55:46 -08:00
deads2k
0fd17b7b2e update client.Request for GroupVersion 2015-12-03 08:16:41 -05:00
feihujiang
ad10ca1da8 Add type for StatusReason constants 2015-12-03 19:22:03 +08:00
Marek Grabowski
813a4c9d19 Merge pull request #17819 from mqliang/eventValidate 
remove TODO: There is no namespace required for node.
 2015-12-03 09:22:06 +01:00
mqliang
8547a5c1ae remove TODO: validate namespace 2015-12-03 08:56:17 +08:00
deads2k
675d8a235e remove Versions from GroupMeta 2015-12-02 16:16:36 -05:00
k8s-merge-robot
ee71ddcefe Merge pull request #17956 from deads2k/gv-requestscope 
Auto commit by PR queue bot
 2015-12-02 08:00:33 -08:00
k8s-merge-robot
b3846ea748 Merge pull request #17862 from feihujiang/ensureHeadlessServicePortEqualToTargetPort 
Auto commit by PR queue bot
 2015-12-02 03:35:36 -08:00
deads2k
a7dd09ec47 update requestScope to fully qualify kind and resource 2015-12-01 16:50:24 -05:00
k8s-merge-robot
727412c5ce Merge pull request #15533 from ZJU-SEL/git-volume 
Auto commit by PR queue bot
 2015-12-01 13:14:23 -08:00
Harry Zhang
70a9c0bf56 Add directory in GitRepo and updated tests. 
Update validate and gitRepo

Update generated code
 2015-12-02 00:20:38 +08:00
k8s-merge-robot
77e9066ebb Merge pull request #17099 from feihujiang/moveDefaultingFuncsFromInternalToV1 
Auto commit by PR queue bot
 2015-12-01 07:13:26 -08:00
mqliang
9ff765978a add filedselector for Event 2015-12-01 23:02:48 +08:00
k8s-merge-robot
7644d34759 Merge pull request #15775 from mesosphere/sur-k8sm-482-resource-roles 
Auto commit by PR queue bot
 2015-12-01 05:36:52 -08:00
k8s-merge-robot
a836b1e261 Merge pull request #17326 from caesarxuchao/grooupVersion-lastest 
Auto commit by PR queue bot
 2015-12-01 05:05:40 -08:00
Wojciech Tyczynski
cdded4f011 Use VersionedParams in "extensions" client. 2015-12-01 10:18:55 +01:00
feihujiang
81b095ee52 Ensure headless service port equal to targetPort 2015-12-01 14:37:26 +08:00
k8s-merge-robot
f4ea77bede Merge pull request #17822 from wojtek-t/remove_api_list_options 
Auto commit by PR queue bot
 2015-11-30 20:48:38 -08:00
k8s-merge-robot
55f5e48047 Merge pull request #16628 from caesarxuchao/change-error-type 
Auto commit by PR queue bot
 2015-11-30 17:21:52 -08:00
Chao Xu
6e192760e3 refactoring latest.go GroupVersion; 
clean up latest.go GroupVersions;
remove latest.GroupMeta.Group;
remove latest.GroupMeta.Version.
 2015-11-30 11:30:21 -08:00
deads2k
1ac6d8afd3 update reaper, scaler, describer for GroupKind 2015-11-30 09:22:39 -05:00
Harry Zhang
5552d7007c Add default when latest not claimed 2015-11-30 17:10:50 +08:00
Clayton Coleman
e9e02bdd50 Review comments 2015-11-26 11:53:38 -05:00
Clayton Coleman
9d19238f6c Fix tests to pass with changed external types 2015-11-26 11:53:37 -05:00
Clayton Coleman
af7e7f146d Generated code 2015-11-26 11:53:36 -05:00
Clayton Coleman
1d592e4c28 Unversioned types should not use ambiguous go-int 
All external types that are not int64 are now marked as int32,
including
IntOrString. Prober is now int32 (43 years should be enough of an initial
probe time for anyone).

Did not change the metadata fields for now.
 2015-11-26 11:45:25 -05:00
Wojciech Tyczynski
97c8f1d4fa Remove api.ListOptions 2015-11-26 10:04:12 +01:00
k8s-merge-robot
fc694ea787 Merge pull request #16725 from wojtek-t/update_ugorji 
Auto commit by PR queue bot
 2015-11-25 22:14:20 -08:00
deads2k
8679925847 update RESTMapping API to be properly typed 2015-11-25 14:02:37 -05:00
deads2k
5c4fb5bcbe make RESTMapper.KindFor 2015-11-25 14:02:37 -05:00
Chao Xu
a4700707b3 change the "too old resource version" error from InternalError to 410 Gone. 2015-11-25 10:27:03 -08:00
deads2k
9e9b9f2da3 fix outputversion restmapper 2015-11-25 12:15:48 -05:00
deads2k
ed95a6d77f update scheme to use GroupVersion 2015-11-25 12:15:48 -05:00
deads2k
68b0572974 internal versions 2015-11-25 12:14:06 -05:00
deads2k
6231404682 update decoder to use GroupVersion 2015-11-25 12:14:06 -05:00
k8s-merge-robot
3bd23b185b Merge pull request #17730 from wojtek-t/use_unversioned_list_options_in_client 
Auto commit by PR queue bot
 2015-11-25 09:10:19 -08:00
k8s-merge-robot
e95e3dec42 Merge pull request #17414 from timstclair/apiserver 
Auto commit by PR queue bot
 2015-11-25 05:28:07 -08:00
Wojciech Tyczynski
58062bc347 Regenerate files 2015-11-25 12:34:05 +01:00
k8s-merge-robot
3e56ce6490 Merge pull request #17327 from deads2k/gv-restmapper 
Auto commit by PR queue bot
 2015-11-24 19:08:49 -08:00
k8s-merge-robot
431c67710b Merge pull request #17247 from thockin/airplane_validation_pt3 
Auto commit by PR queue bot
 2015-11-24 18:37:09 -08:00
k8s-merge-robot
d42030170b Merge pull request #15999 from aveshagarwal/master-issue-15624 
Auto commit by PR queue bot
 2015-11-24 17:07:10 -08:00
deads2k
c40dd0335a make DefaultRESTMapper methods type correct 2015-11-24 14:17:37 -05:00
deads2k
94ad6aa0c4 make DefaultRESTMapper use GroupVersion 2015-11-24 14:17:37 -05:00
Wojciech Tyczynski
b6ef62af24 Use unversioned.ListOptions in clients. 2015-11-24 16:52:09 +01:00
k8s-merge-robot
f3753c02ed Merge pull request #17369 from wojtek-t/use_unversioned_list_options 
Auto commit by PR queue bot
 2015-11-24 07:32:37 -08:00
Avesh Agarwal
c053290e04 This commit regenerates docs. 2015-11-24 09:59:54 -05:00
Avesh Agarwal
3d5207fd73 This commit adds type information to events. 
This addresses issue #15624.
 2015-11-24 09:59:54 -05:00
Avesh Agarwal
751e7ba67c This commit regenerates types.generated.go in pka/api and pkg/api/v1. 2015-11-24 09:59:54 -05:00
deads2k
5077e9b644 make register.GroupVersion use GroupVersion 2015-11-24 09:45:36 -05:00
k8s-merge-robot
4fd6b6df06 Merge pull request #17316 from deads2k/gv-ClientForVersion 
Auto commit by PR queue bot
 2015-11-24 06:24:28 -08:00
Wojciech Tyczynski
bf13bef955 Use unversioned.ListOptions in API server. 2015-11-24 14:42:21 +01:00
k8s-merge-robot
06ef4b0a83 Merge pull request #17156 from feihujiang/moveListFunctionsFromRuntimeToMetaPackage 
Auto commit by PR queue bot
 2015-11-23 14:13:25 -08:00
Tim St. Clair
20ead45af9 Move etcd_util.go to separate package 2015-11-23 11:32:50 -08:00
Tim Hockin
ceee678b29 Rename validation 'New' funcs 2015-11-23 10:01:43 -08:00
Tim Hockin
682f2a5a79 Stronger typing for validation ErrorList 2015-11-23 10:01:43 -08:00
Sergiusz Urbaniak
9eae47c6e6 scheduler: implement role awareness 2015-11-23 17:27:14 +01:00
Sergiusz Urbaniak
1a43dcf720 api, kubectl: move getSinglePodTotalRequestsAndLimits to api.PodRequestsAndLimits 2015-11-23 17:27:14 +01:00
Tim Hockin
f8ad75df44 Clarify invalid vs not-supported 2015-11-23 08:07:17 -08:00
k8s-merge-robot
32c240b350 Merge pull request #17245 from thockin/airplane_validation_pt1 
Auto commit by PR queue bot
 2015-11-23 06:45:28 -08:00
Wojciech Tyczynski
f09e8d3eb0 ref 2015-11-23 09:56:25 +01:00
Wojciech Tyczynski
77fd936b5f Create unversioned.ListOptions object. 2015-11-23 09:55:33 +01:00
Tim Hockin
48b49a5cae s/ValidationErrorList/ErrorList/ 2015-11-22 20:13:20 -08:00
Tim Hockin
d64d1fbb3d s/ValidationError/Error/ 2015-11-22 20:12:46 -08:00
Tim Hockin
2a127d089a s/ValidationErrorType/ErrorType/ 2015-11-22 20:12:39 -08:00
Tim Hockin
0ff66da346 Move fielderrors into validation 2015-11-22 20:12:20 -08:00
k8s-merge-robot
759df1ef6e Merge pull request #17569 from quinton-hoole/2015-11-19-fix-node-zone-labels 
Auto commit by PR queue bot
 2015-11-21 16:33:11 -08:00
k8s-merge-robot
42fcaf0800 Merge pull request #17217 from wojtek-t/marshall_selector 
Auto commit by PR queue bot
 2015-11-21 10:13:37 -08:00
k8s-merge-robot
4dbf7c637c Merge pull request #17163 from wojtek-t/extend_decoder 
Auto commit by PR queue bot
 2015-11-21 08:37:29 -08:00
deads2k
a87d927588 update client.Config to use GroupVersion 2015-11-21 08:29:26 -05:00
Tim St. Clair
e4eff4bd6b Fix typo: s/recieve/receive/ 2015-11-19 19:23:40 -08:00
feihujiang
ad79fa6e84 Move list functions from runtime to meta package 2015-11-20 09:20:55 +08:00
Quinton Hoole
bec4167525 Make zone and region node labels conformant. 
Fixes #17506
 2015-11-19 16:35:58 -08:00
Timothy St. Clair
02851dd1b7 Removal of fakeClient and shift to storage.Interface for 
all registry tests.
 2015-11-19 10:34:30 -06:00
Wojciech Tyczynski
975871e0a0 JSON marshaling/unmarshaling of label Selector 2015-11-19 16:44:48 +01:00
Wojciech Tyczynski
d7b098b0e9 Add DecodeParametersInto method to Codec. 2015-11-18 09:56:04 +01:00
k8s-merge-robot
125ab2cad1 Merge pull request #17232 from deads2k/gv-restmapping-2 
Auto commit by PR queue bot
 2015-11-17 03:33:24 -08:00
k8s-merge-robot
5e20dcfd6f Merge pull request #17227 from deads2k/gv-apigv 
Auto commit by PR queue bot
 2015-11-17 01:53:17 -08:00
Tim Hockin
ba383bcfeb Refactor IntOrString into a new pkg 
pkg/util/intstr is a cleaner encapsulation for this type and supporting
functions.  No behavioral change.
 2015-11-16 10:57:52 -08:00
deads2k
303bcad398 use groupversion in RESTMapping 2015-11-16 09:22:11 -05:00
deads2k
bf983e942c use GroupVersion in APIGroupVersion for api installer 2015-11-16 07:42:00 -05:00
Tim Hockin
35ab5c6234 Add a REST hook for post-validation canonicalize 
This is a simple hook that only Endpoints uses for now.
 2015-11-12 21:13:16 -08:00
k8s-merge-robot
e80dd6689f Merge pull request #16866 from justinsb/zone_labels_on_nodes 
Auto commit by PR queue bot
 2015-11-12 07:25:37 -08:00
feihujiang
8cf6d785b7 Move defaulting funcs from internal to v1 2015-11-11 15:09:16 +08:00
k8s-merge-robot
f25f5a2c85 Merge pull request #17053 from zhengguoyong/rename_validGroupVersions 
Auto commit by PR queue bot
 2015-11-10 10:11:21 -08:00
zhengguoyong
973400a6fb Kill TODO, rename var 2015-11-10 21:24:21 +08:00
eulerzgy
501c2825cf Make order of fun consistent 2015-11-10 17:43:54 +08:00
k8s-merge-robot
4e39dd4b7d Merge pull request #16925 from mikedanese/headless-fix-1 
Auto commit by PR queue bot
 2015-11-07 08:03:18 -08:00
k8s-merge-robot
9981f99949 Merge pull request #16849 from feihujiang/cleanupDeprecatedV1beta1Content 
Auto commit by PR queue bot
 2015-11-07 04:15:32 -08:00
k8s-merge-robot
354c6f3b12 Merge pull request #16834 from caesarxuchao/GroupVersion-Object 
Auto commit by PR queue bot
 2015-11-07 03:43:30 -08:00
Tim St. Clair
1e88a682da Add liveness/readiness probe parameters 
- PeriodSeconds - How often to probe
- SuccessThreshold - Number of successful probes to go from failure to success state
- FailureThreshold - Number of failing probes to go from success to failure state

This commit includes to changes in behavior:

1. InitialDelaySeconds now defaults to 10 seconds, rather than the
kubelet sync interval (although that also defaults to 10 seconds).
2. Prober only retries on probe error, not failure. To compensate, the
default FailureThreshold is set to the maxRetries, 3.
 2015-11-06 10:46:40 -08:00
Mike Danese
09295cd664 Headless services should not need to declare ports 2015-11-06 09:57:41 -08:00
feihujiang
eac8d6a997 Cleanup the content of deprecated V1beta1 2015-11-06 13:42:51 +08:00
k8s-merge-robot
6b7115067d Merge pull request #16807 from smarterclayton/server_backpressure_on_etcd_down 
Auto commit by PR queue bot
 2015-11-05 21:19:30 -08:00
Chao Xu
2f012ae036 run gen-swagger-docs 2015-11-05 15:49:52 -08:00
Chao Xu
15e6ca5ac5 rename to GroupVersion and rename the one in type.go to GroupVersionForDiscovery 2015-11-05 14:52:58 -08:00
Chao Xu
fb360bca98 add comments 2015-11-05 14:15:01 -08:00
Chao Xu
6419924a5e add ugorji unmarshaller and address comments 2015-11-05 13:46:44 -08:00
Justin Santa Barbara
b2c2d617cf Label nodes with Zone information, if available 
This lays the groundwork for simple multizone capabilities.

In a cloud environment, nodes are typically created by the kubelet
registering with the API server.  When creating a new node, we now query
the cloudprovider to see if it can provide Zone information, and if so
we add some well-known labels to the Node we are creating.
 2015-11-05 14:35:05 -05:00
Chao Xu
9d52b0fc08 add GroupVersion struct 2015-11-04 18:38:26 -08:00
Clayton Coleman
3da15535b6 Provide backpressure to clients when etcd goes down 
When etcd is down today we don't specifically handle the error involved,
which means clients get a generic 500 error. This commit adds a formal
error type internally for both WatchExpired and EtcdUnreachable, and
then converts them to api/errors before returning to the client. It also
upgrades the client to retry on any 429 or 5xx error that has a
Retry-After header, instead of just 429.

In combination, this allows the apiserver to exert backpressure on
controllers that are hotlooping.  Picked 2 seconds by default, but we
could potentially ramp that up even further in a future iteration.
 2015-11-04 16:05:12 -05:00
Jordan Liggitt
b3157d1445 Ensure HPA has valid resource/name/subresource, validate path segments 2015-11-03 14:46:17 -05:00
k8s-merge-robot
f371b3d891 Merge pull request #16621 from timstclair/metrics-lite 
Auto commit by PR queue bot
 2015-11-03 02:13:19 -08:00
feihujiang
f7bfb04665 Add a comment that not return an error for rootscoped resources with namesapce 2015-11-03 11:00:01 +08:00
Tim St. Clair
5cd5b80f9e Set up new "metrics" API group. 
This commit only adds 2 placeholder structs to the API, for the purposes
of separating the API group setup from the API discussion.
 2015-11-02 09:49:02 -08:00
feihujiang
3603b14977 Move service strategy to registry/service package 2015-11-02 19:56:03 +08:00
Mike Danese
82111a7cb5 add component config api group 2015-10-31 11:42:38 -07:00
k8s-merge-robot
55246db600 Merge pull request #16491 from wojtek-t/merge_to_options_in_storage 
Auto commit by PR queue bot
 2015-10-30 04:30:17 -07:00
Mike Danese
f237db81f0 daemonset don't place pods on notready nodes 2015-10-29 11:11:20 -07:00
Wojciech Tyczynski
9c53f301f1 Merge selectors with ListOptions. 2015-10-29 15:42:57 +01:00
k8s-merge-robot
cd7e4bd6bb Merge pull request #16364 from liggitt/unversioned_types 
Auto commit by PR queue bot
 2015-10-29 05:56:17 -07:00
k8s-merge-robot
d5be3635e5 Merge pull request #16273 from wojtek-t/list_options_in_api 
Auto commit by PR queue bot
 2015-10-29 01:57:29 -07:00
k8s-merge-robot
d695177229 Merge pull request #16054 from smarterclayton/revert_extension_syntax 
Auto commit by PR queue bot
 2015-10-27 19:57:15 -07:00
Daniel Smith
3f3ca480be Merge pull request #16080 from yujuhong/reset_defaults 
Add custom pod conversion functions from pre-v1.1 mirror pods
 2015-10-27 15:47:34 -07:00