Tim Hockin 
							
						 
					 
					
						
						
							
						
						915655a2eb 
					 
					
						
						
							
							Document godep updates better  
						
						 
						
						... 
						
						
						
						`godep update` doesn't work.  It just says 'nothing to update'.  Drop it, and
use The Big Hammer instead. 
						
						
					 
					
						2016-05-16 13:15:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Isaac Hollander McCreery 
							
						 
					 
					
						
						
							
						
						4ef33834d3 
					 
					
						
						
							
							Fix link to Jenkins  
						
						 
						
						
						
						
					 
					
						2016-05-16 07:29:04 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Klaus Ma 
							
						 
					 
					
						
						
							
						
						f3556be51d 
					 
					
						
						
							
							Update kubectl service output.  
						
						 
						
						
						
						
					 
					
						2016-05-14 11:10:29 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						0114eef83d 
					 
					
						
						
							
							Update docs re: godep  
						
						 
						
						
						
						
					 
					
						2016-05-12 22:04:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eric Paris 
							
						 
					 
					
						
						
							
						
						ad3e18d60c 
					 
					
						
						
							
							Stop pinning to version v53  
						
						 
						
						
						
						
					 
					
						2016-05-12 22:04:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						7339b7c094 
					 
					
						
						
							
							Merge pull request  #25162  from mikebrow/devel-tree-80col-updates-C  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
devel/ tree further minor edits
Address line wrap issue #1488 . Also cleans up other minor editing issues in the docs/devel/* tree such as spelling errors, links, content tables...
Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-10 18:15:19 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Bailey 
							
						 
					 
					
						
						
							
						
						c7a7f0592f 
					 
					
						
						
							
							Update links for the user and troubleshooting guides for the build  
						
						 
						
						... 
						
						
						
						cop to copy-paste from the oncall documentation. 
						
						
					 
					
						2016-05-10 11:15:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						f6eefd4762 
					 
					
						
						
							
							Merge pull request  #25168  from mikebrow/devel-tree-80col-updates-D  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
devel/ tree more minor edits
Address line wrap issue #1488 . Also cleans up other minor editing issues in the docs/devel/* tree such as spelling errors, links, content tables...
Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-10 09:35:34 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						aade9eaabc 
					 
					
						
						
							
							Merge pull request  #24878  from pwittrock/docsdoc  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
How to update docs - doc
## Contributor guidelines
1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md ).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md ).
1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes ) in the block below. (_this would also contain updated detail later about this new template_)
```release-note
* Use the release-note-* labels to set the release note state 
* Clear this block to use the PR title as the release note 
-OR-
* Enter your extended release note here
``` 
						
						
					 
					
						2016-05-09 23:18:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						27f418848d 
					 
					
						
						
							
							Merge pull request  #25099  from mikebrow/devel-tree-80col-updates  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
devel/ tree minor edits
Address line wrap issue #1488 . Also cleans up other minor editing issues in the docs/devel/* tree such as spelling errors, links,...
Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-09 21:09:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						0054ddcad1 
					 
					
						
						
							
							devel/ tree 80col updates; and other minor edits  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-09 18:39:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phillip Wittrock 
							
						 
					 
					
						
						
							
						
						c6aa507aae 
					 
					
						
						
							
							Address PR comments  
						
						 
						
						
						
						
					 
					
						2016-05-09 23:20:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						ff339c77cf 
					 
					
						
						
							
							Merge pull request  #25269  from janetkuo/kubectl-conventions  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Document that kubectl commands shouldn't have aliases
## Pull Request Guidelines
1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md ).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md ).
1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes ) in the block below.
```release-note
* Use the release-note-* labels to set the release note state 
* Clear this block to use the PR title as the release note 
-OR-
* Enter your extended release note here
```
Ref https://github.com/kubernetes/kubernetes/issues/25180#issuecomment-217453402  @kubernetes/kubectl 
[]() 
						
						
					 
					
						2016-05-09 15:03:19 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phillip Wittrock 
							
						 
					 
					
						
						
							
						
						448cc8754d 
					 
					
						
						
							
							Address PR comments  
						
						 
						
						
						
						
					 
					
						2016-05-09 13:39:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phillip Wittrock 
							
						 
					 
					
						
						
							
						
						163a4873c4 
					 
					
						
						
							
							How to update docs - doc  
						
						 
						
						
						
						
					 
					
						2016-05-09 13:39:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						833cfc08b3 
					 
					
						
						
							
							Merge pull request  #24894  from david-mcmahon/cp2  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Update cherrypick doc for release notes to more accurately reflect current process.
## Contributor guidelines
1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md ).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md ).
1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes ) in the block below. 
						
						
					 
					
						2016-05-09 12:12:11 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						b5ccc1465d 
					 
					
						
						
							
							Document that kubectl commands shouldn't have aliases  
						
						 
						
						
						
						
					 
					
						2016-05-09 11:19:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						a42ea536ba 
					 
					
						
						
							
							devel/ tree 80col wrap and other minor edits  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-09 12:42:50 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David McMahon 
							
						 
					 
					
						
						
							
						
						8c15651ff2 
					 
					
						
						
							
							Update pull request and cherrypick docs for release notes to more accurately reflect current process.  
						
						 
						
						
						
						
					 
					
						2016-05-09 10:19:19 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								deads2k 
							
						 
					 
					
						
						
							
						
						8e8e9cdce0 
					 
					
						
						
							
							create command guidance  
						
						 
						
						
						
						
					 
					
						2016-05-09 08:14:48 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						18e7a3eb24 
					 
					
						
						
							
							Get rid of hack/after-build scripts  
						
						 
						
						... 
						
						
						
						The build is now fast enough to not need them. 
						
						
					 
					
						2016-05-08 20:32:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Hockin 
							
						 
					 
					
						
						
							
						
						cbf886c7f4 
					 
					
						
						
							
							Convert everything to use vendor/  
						
						 
						
						
						
						
					 
					
						2016-05-08 20:30:37 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								CJ Cullen 
							
						 
					 
					
						
						
							
						
						69756576f2 
					 
					
						
						
							
							Update adding-an-APIGroup.md for  #23110  
						
						 
						
						
						
						
					 
					
						2016-05-07 11:23:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Bailey 
							
						 
					 
					
						
						
							
						
						742a164ba1 
					 
					
						
						
							
							Merge pull request  #24889  from dlorenc/docfix  
						
						 
						
						... 
						
						
						
						Add missing "--test" flag to conformance test instructions. 
						
						
					 
					
						2016-05-06 13:29:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Brown 
							
						 
					 
					
						
						
							
						
						77e63c5043 
					 
					
						
						
							
							devel/ tree 80col wrap and other minor edits  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mike Brown <brownwm@us.ibm.com > 
						
						
					 
					
						2016-05-04 17:05:44 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						fee33e1a5c 
					 
					
						
						
							
							Merge pull request  #25048  from david-mcmahon/note-in-body  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Update docs to describe new PR release-note block parsing. 
						
						
					 
					
						2016-05-04 03:06:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David McMahon 
							
						 
					 
					
						
						
							
						
						3118b0c6c4 
					 
					
						
						
							
							Update docs to describe new PR release-note block parsing.  
						
						 
						
						
						
						
					 
					
						2016-05-03 11:45:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Janet Kuo 
							
						 
					 
					
						
						
							
						
						446ed330ac 
					 
					
						
						
							
							Update testing convention docs  
						
						 
						
						
						
						
					 
					
						2016-05-03 10:29:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dan Lorenc 
							
						 
					 
					
						
						
							
						
						d6279917fe 
					 
					
						
						
							
							Add missing "--test" flag to conformance test instructions.  
						
						 
						
						
						
						
					 
					
						2016-05-03 07:25:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						926ee5b90f 
					 
					
						
						
							
							Merge pull request  #24641  from caesarxuchao/pods-test  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
move pods.go to pods_test.go
fix  #24635  
						
						
					 
					
						2016-05-02 13:16:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Morgan Bauer 
							
						 
					 
					
						
						
							
						
						d2caed3ecc 
					 
					
						
						
							
							more explicit requirements for pre-commit hook  
						
						 
						
						
						
						
					 
					
						2016-04-28 18:45:20 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chao Xu 
							
						 
					 
					
						
						
							
						
						6ceebe72b9 
					 
					
						
						
							
							move pods.go to pods_test.go  
						
						 
						
						
						
						
					 
					
						2016-04-28 15:39:28 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						97f1f5993e 
					 
					
						
						
							
							Merge pull request  #24231  from mikebrow/design-docs-80col-updates  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Cleans up line wrap at 80 cols and some minor editing issues 
Address line wrap issue #1488 .  Also cleans up other minor editing issues in the docs/design/* tree such as spelling errors. 
Signed-off-by: mikebrow <brownwm@us.ibm.com > 
						
						
					 
					
						2016-04-28 06:49:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Clayton Coleman 
							
						 
					 
					
						
						
							
						
						bd1ddd32d8 
					 
					
						
						
							
							Protobuf doc changes  
						
						 
						
						
						
						
					 
					
						2016-04-27 21:15:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mikebrow 
							
						 
					 
					
						
						
							
						
						eb43e19fd0 
					 
					
						
						
							
							updates to vagrant.md  
						
						 
						
						... 
						
						
						
						Signed-off-by: mikebrow <brownwm@us.ibm.com > 
						
						
					 
					
						2016-04-20 17:17:13 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mikebrow 
							
						 
					 
					
						
						
							
						
						1053be8e33 
					 
					
						
						
							
							updates to devel/*.md files  
						
						 
						
						... 
						
						
						
						Signed-off-by: mikebrow <brownwm@us.ibm.com > 
						
						
					 
					
						2016-04-19 13:31:01 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						7ab0a9f634 
					 
					
						
						
							
							Merge pull request  #23424  from ddysher/update-api-changes  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Update API change for internal types 
						
						
					 
					
						2016-04-19 05:16:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Deyuan Deng 
							
						 
					 
					
						
						
							
						
						998559a99c 
					 
					
						
						
							
							Update API change for internal types  
						
						 
						
						
						
						
					 
					
						2016-04-19 18:57:07 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prashanth Balasubramanian 
							
						 
					 
					
						
						
							
						
						98070fccd3 
					 
					
						
						
							
							Clarify api-group docs by a tiny bit.  
						
						 
						
						
						
						
					 
					
						2016-04-15 19:25:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim St. Clair 
							
						 
					 
					
						
						
							
						
						b0d3f32e88 
					 
					
						
						
							
							Update test/e2e for test/e2e/framework refactoring  
						
						 
						
						
						
						
					 
					
						2016-04-13 10:50:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						96a32fda4e 
					 
					
						
						
							
							Merge pull request  #23949  from mikebrow/development-guide-update  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Minor doc edits to development.md 
Noted a few small clarity issues going through the development guide and while it mentioned local builds, it was missing instructions for building on a local go developer environment.  
Signed-off-by: mikebrow <brownwm@us.ibm.com > 
						
						
					 
					
						2016-04-11 05:14:59 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David McMahon 
							
						 
					 
					
						
						
							
						
						a71cb19867 
					 
					
						
						
							
							Clarify release-note label requirement for non-master PRs.  
						
						 
						
						
						
						
					 
					
						2016-04-07 17:14:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						2912fcc3ba 
					 
					
						
						
							
							Merge pull request  #23939  from david-mcmahon/relnotes-fixall  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Sync up all release note related docs with the latest process/procedures
@eparis we also need to get the munger in line with the latest.  I think we've stopped making changes at this point.  #23743  is coming up but is an enhancement to the base procedures here.
cc @bgrant0607 
						
						
					 
					
						2016-04-07 17:07:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David McMahon 
							
						 
					 
					
						
						
							
						
						68b2c8eb07 
					 
					
						
						
							
							Sync up all release note related docs with the latest process/procedures.  
						
						 
						
						
						
						
					 
					
						2016-04-07 15:10:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						235f8f13c0 
					 
					
						
						
							
							Merge pull request  #22146  from luxas/binary_release_notes  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Add some info about binary downloads
This should be merged before `v1.2`. Useful information.
WDYT?
@wojtek-t @fgrzadkowski @zmerlynn @mikedanese @brendandburns @thockin 
						
						
					 
					
						2016-04-07 04:03:09 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mikebrow 
							
						 
					 
					
						
						
							
						
						8ad866aa18 
					 
					
						
						
							
							minor edits to development.md to make the first steps easier and more obvious for newcommers  
						
						 
						
						... 
						
						
						
						Signed-off-by: mikebrow <brownwm@us.ibm.com > 
						
						
					 
					
						2016-04-06 19:37:14 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						b141c6903e 
					 
					
						
						
							
							Merge pull request  #23925  from luxas/go_version_support  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Add a note about supported go version
Broke out from #22149  
@wojtek-t 
						
						
					 
					
						2016-04-06 15:33:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Lucas Käldström 
							
						 
					 
					
						
						
							
						
						e9eaba3cbd 
					 
					
						
						
							
							Add a note about supported go version  
						
						 
						
						
						
						
					 
					
						2016-04-06 20:08:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wojciech Tyczynski 
							
						 
					 
					
						
						
							
						
						57b76eff45 
					 
					
						
						
							
							Remove Shippable  
						
						 
						
						
						
						
					 
					
						2016-04-06 01:06:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								k8s-merge-robot 
							
						 
					 
					
						
						
							
						
						4f329516ae 
					 
					
						
						
							
							Merge pull request  #22149  from luxas/onedotsix  
						
						 
						
						... 
						
						
						
						Automatic merge from submit-queue
Up to golang 1.6
A second attempt to upgrade go version above `go1.4`
Merge ASAP after you've cut the `release-1.2` branch and feel ready.
`go1.6` should perform slightly better than `go1.5`, so this time it might work
@gmarek @wojtek-t @zmerlynn @mikedanese @brendandburns @ixdy @thockin 
						
						
					 
					
						2016-04-05 13:26:18 -07:00