github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,882 Commits 1 Branch 31 Tags 1,019 MiB
72db123025
Commit Graph

1273 Commits

Author SHA1 Message Date
Satnam Singh
b964f3c911 Merge pull request #9739 from bprashanth/sno 
Fix kubectl stop rc with sequence numbers
 2015-06-19 15:30:26 -07:00
Satnam Singh
3591a543d1 Merge pull request #9919 from liggitt/port_protocol_validation 
Validate port protocol case strictly
 2015-06-19 15:18:03 -07:00
Prashanth Balasubramanian
9ed9bd1c4f Add a generation number to the object meta of all objects, and status of rcs 2015-06-19 14:32:08 -07:00
Satnam Singh
078e85cfdb Merge pull request #10076 from caesarxuchao/pr/9966/head 
based on #9966: fix annoying 'please check...' messages; remove v1beta1&2 ref
 2015-06-19 11:56:47 -07:00
Satnam Singh
f02c685532 Merge pull request #10007 from feihujiang/improveCreateSchemaValidate 
improve kubectl create --validate, aggregate errors and handle requir…
 2015-06-19 11:43:44 -07:00
Jordan Liggitt
68a8a25494 Rename pod.spec.serviceAccount -> pod.spec.serviceAccountName for v1 2015-06-18 22:38:00 -04:00
Chao Xu
5673f73378 fix the left pre V1 field names in 290c4618c331f4f30a278af520121ff35 2015-06-18 18:44:55 -07:00
Satnam Singh
59a96f1028 Merge pull request #9688 from liggitt/validate_pod_spec 
Validate service account name in pod spec
 2015-06-18 17:18:09 -07:00
Satnam Singh
0f81a65f74 Merge pull request #10019 from feihujiang/deleteTodoNotes 
Delete TODO notes
 2015-06-18 15:53:10 -07:00
Clayton Coleman
93f921b677 Swagger output for PATCH can be more strongly typed 2015-06-18 13:04:20 -04:00
feihujiang
a7b22e3773 Delete TODO notes (The syntax here is the reverse of the (old, new) pattern in most other validation. Fix this.) 2015-06-18 20:13:17 +08:00
feihujiang
d5fcd9f153 improve kubectl create --validate, aggregate errors and handle require fields 2015-06-18 16:22:09 +08:00
Saad Ali
9da215e085 Merge pull request #9897 from derekwaynecarr/limit_range_validation 
Add LimitRange range validation
 2015-06-17 17:20:18 -07:00
markturansky
0a6b7b61ec Changed PVClaimVolumeSource name to match other volume names 2015-06-17 16:17:49 -04:00
Saad Ali
641f8d47d3 Merge pull request #9828 from caesarxuchao/remove-testdata-v1beta1 
remove pkg/api/validation/testdata/v1beta1/*
 2015-06-17 11:36:03 -07:00
derekwaynecarr
2518d8c0fc Add LimitRange range validation 2015-06-17 10:24:31 -04:00
Jordan Liggitt
2b840279d9 Validate service account name in pod spec 2015-06-16 21:09:01 -04:00
Jordan Liggitt
ee4cd972e0 Validate port protocol case strictly 2015-06-16 20:28:11 -04:00
Saad Ali
0aae358d2d Merge pull request #9835 from caesarxuchao/remove-testapi-nsQuery 
Update pkg/api/testapi because namespace is always in the path now
 2015-06-16 14:54:36 -07:00
Chao Xu
a309d3e652 Update pkg/api/testapi because namespace is always in the path since we remove v1beta1/2 2015-06-16 14:12:03 -07:00
Saad Ali
d6b50d5602 Merge pull request #9823 from caesarxuchao/remove-PodContainerInfo 
remove PodContainerInfo from api/types.go
 2015-06-16 13:38:53 -07:00
Chao Xu
d9e8939ae4 remove pkg/api/validation/testdata/v1beta1/* 2015-06-15 16:20:14 -07:00
Chao Xu
3815b4c985 remove PodContainerInfo from api/types.go 2015-06-15 15:04:37 -07:00
Fabio Yeon
4e6bd63256 Merge pull request #9597 from mikedanese/fix-swagger-validate-panic 
fix panic in kubectl --validate when no apiVersion is passed
 2015-06-15 13:05:11 -07:00
Fabio Yeon
b65c321a87 Merge pull request #9772 from feihujiang/noKindErrorMessage 
make the kind not registered in versions  error message more precise
 2015-06-15 10:26:58 -07:00
Filip Grzadkowski
cdc5034ce4 Fix error message for missing imagePullPolicy 2015-06-15 16:02:32 +02:00
feihujiang
ad4f22bf6a improve kubectl error message when an object with kind not registered in versions 2015-06-15 09:18:28 +08:00
Daniel Smith
9423f80d20 fix test bug & conversion bug 2015-06-12 13:55:10 -07:00
Daniel Smith
47294dd326 Revert "Revert "Test Service creation -> endpoint generation latency"" 
This reverts commit 654857114e.
 2015-06-11 18:34:31 -07:00
Abhi Shah
b556285661 Merge pull request #9550 from feihujiang/validationFailure 
remove useless glog.Infof
 2015-06-10 14:45:10 -07:00
Mike Danese
2bbb78d50a actually return validation errors instead of just creating them 2015-06-10 12:45:10 -07:00
Brendan Burns
654857114e Revert "Test Service creation -> endpoint generation latency" 2015-06-09 21:24:00 -07:00
feihujiang
5867b5ce6b remove useless glog.Infof 2015-06-10 11:02:28 +08:00
krousey
1c58d2a766 Merge pull request #9354 from lavalamp/logSpam 
Test Service creation -> endpoint generation latency
 2015-06-09 15:51:26 -07:00
krousey
d7f7d84a5e Merge pull request #9387 from jsdir/9340-signature 
Improve signature consistency for ValidateObjectMetaUpdate
 2015-06-09 10:20:18 -07:00
feihujiang
37abe11f8a kubetcl create --validate crashes when no apiVersion or kind is provided 2015-06-09 10:38:43 +08:00
Daniel Smith
aa9bdcbc4a add missing endpoints field label conversion function 2015-06-08 16:23:21 -07:00
Jason Sommer
aa892b7143 Replace meta with new 2015-06-08 17:06:56 -05:00
Jason Sommer
d59a8ff7f8 Improve signature consistency for ValidateObjectMetaUpdate 
Fixes #9340

Signed-off-by: Jason Sommer <jsdirv@gmail.com>
 2015-06-08 02:56:38 -05:00
Quinton Hoole
6ff203e9da Merge pull request #9280 from caesarxuchao/make-v1-preferred 
Make v1 the preferred api version
 2015-06-05 15:23:14 -07:00
Quinton Hoole
8b01ecb53a Merge pull request #9024 from markturansky/recyc_controllers 
PersistentVolumeRecycler controller
 2015-06-05 11:39:08 -07:00
Quinton Hoole
8f55d9e619 Merge pull request #9317 from nikhiljindal/podnodeName 
Updating StatusDetails.ID to Name in internal API
 2015-06-05 11:23:09 -07:00
nikhiljindal
7cc50448e3 Updating StatusDetails.ID to Name in internal API 2015-06-05 07:17:02 -07:00
Yifan Gu
f197a9db4e kubelet: Minor refactors. 
Remove some TODOs.
Unexport DockerManager.Puller and DockerManager.PodInfraContainerImage.
Add "docker" for all "go-dockerclient" imports.
 2015-06-04 16:08:45 -07:00
Chao Xu
1605fc7347 fix unit tests 2015-06-04 15:09:47 -07:00
Chao Xu
dfc77f7883 make v1 the preferred api version 2015-06-04 15:08:56 -07:00
markturansky
2829fadfad PV Recycling API 2015-06-04 15:39:34 -04:00
Chao Xu
0a7dc87b05 address nikhiljindal's comments in #9225 2015-06-04 10:20:29 -07:00
Chao Xu
c1ba3f21d5 remove outdated test from latest_test.go 2015-06-04 09:39:05 -07:00
Brian Grant
656fa7bea1 Merge pull request #9225 from caesarxuchao/add-v1-tests-general 
Add v1 tests
 2015-06-03 22:18:21 -07:00
Brian Grant
ab1e3cc789 Merge pull request #9215 from RichieEscarez/8977_restartpolicy 
Replaced instances of "RestartPolicyAlways" "RestartPolicyOnFailure" …
 2015-06-03 22:16:11 -07:00
Chao Xu
2ee8eb67a9 remove import of v1beta3 package in api/conversion_test.go 2015-06-03 16:50:40 -07:00
Chao Xu
cb123dc957 in api/testapi/testapt_test.go, remove tests for v1beta1, add tests for v1 2015-06-03 16:48:05 -07:00
RichieEscarez
91907f66a7 Replaced instances of "RestartPolicyAlways" "RestartPolicyOnFailure" "RestartPolicyNever" with "Always" "OnFailure" "Never" 2015-06-03 13:35:35 -07:00
Chao Xu
115823ff1b add v1 to serialization_test.go 2015-06-03 13:22:01 -07:00
Brian Grant
be4a501e25 Merge pull request #9099 from derekwaynecarr/improve_quota_describe_output 
Fix bug in quota describe output
 2015-06-03 13:14:30 -07:00
derekwaynecarr
6968a4e0df Improve quota describe output 2015-06-03 15:16:24 -04:00
Tim Hockin
1aa9b0b86a Don't allow link-local Endpoints 2015-06-03 11:40:04 -07:00
Chao Xu
3358f37871 remove imports of v1 in latest_test.go 2015-06-02 17:27:57 -07:00
Chao Xu
89c8949e78 add v1 to hack/test-integration.sh 2015-06-02 14:55:45 -07:00
Chao Xu
ff6947625d add v1 tests to hack/test-go; let default value of Container.SecurityContext to be nil 2015-06-02 14:55:45 -07:00
Filip Grzadkowski
98115facfd Revert "Gracefully delete pods from the Kubelet" 2015-06-02 23:40:05 +02:00
Brian Grant
3f07503cea Merge pull request #9103 from liggitt/omitempty_service_account 
fix omitempty on PodSpec.ServiceAccount in v1beta3
 2015-06-02 10:41:11 -07:00
Jordan Liggitt
870be9768a fix omitempty on service account in v1beta3 2015-06-02 01:31:06 -04:00
Clayton Coleman
72ee028cab Gracefully delete pods from the Kubelet 
This commit wires together the graceful delete option for pods
on the Kubelet.  When a pod is deleted on the API server, a
grace period is calculated that is based on the
Pod.Spec.TerminationGracePeriodInSeconds, the user's provided grace
period, or a default.  The grace period can only shrink once set.
The value provided by the user (or the default) is set onto metadata
as DeletionGracePeriod.

When the Kubelet sees a pod with DeletionTimestamp set, it uses the
value of ObjectMeta.GracePeriodSeconds as the grace period
sent to Docker.  When updating status, if the pod has DeletionTimestamp
set and all containers are terminated, the Kubelet will update the
status one last time and then invoke Delete(pod, grace: 0) to
clean up the pod immediately.
 2015-06-01 19:23:59 -04:00
Kris
f4e2c738f6 Delete deprecated API versions 
pkg/service:

There were a couple of references here just as a reminder to change the
behavior of findPort. As of v1beta3, TargetPort was always defaulted, so
we could remove findDefaultPort and related tests.

pkg/apiserver:

The tests were using versioned API codecs for some of their encoding
tests. Necessary API types had to be written and registered with the
fake versioned codecs.

pkg/kubectl:

Some tests were converted to current versions where it made sense.
 2015-05-29 17:17:35 -07:00
Rohit Jnagal
25e63e737a Merge pull request #9014 from caesarxuchao/image-omitempty 
make the Container.Image field optional in v1
 2015-05-29 16:32:30 -07:00
Rohit Jnagal
fdefd120c1 Merge pull request #8980 from caesarxuchao/Remove_TemplateRef 
remove ReplicationControllerSpec.TemplateRef
 2015-05-29 14:53:25 -07:00
Chao Xu
74f66b3c96 make the Container.Image field optional 2015-05-29 13:12:35 -07:00
Chao Xu
0798ea9ff7 remove ReplicationControllerSpec.TemplateRef from v1beta3/types.go and v1/types.go for now 2015-05-28 17:41:47 -07:00
Chao Xu
2f6e5e2e08 Update ContainerState.Termination to ContainerState.Terminated in pkg/api/types.go and pkg/api/v1/types.go 2015-05-28 17:18:24 -07:00
Tim Hockin
da78ab6b63 Merge pull request #8740 from thockin/nix-portal 
Rename "portalIP" to "clusterIP"
 2015-05-28 16:52:02 -07:00
Kris Rousey
22b2c68c02 Update go-restful to get stable sorting in spec 
This reverts commit 4a7071e7f7.
 2015-05-28 16:43:13 -07:00
Tim Hockin
9a49e8155f Update generated code 2015-05-28 16:28:18 -07:00
Tim Hockin
4318ca5a8b Rename 'portal IP' to 'cluster IP' most everywhere 
This covers obvious transforms, but not --portal_net, $PORTAL_NET and
similar.
 2015-05-28 16:10:44 -07:00
Tim Hockin
4a7071e7f7 Revert "Update go-restful to get stable sorting in spec" 2015-05-28 16:04:11 -07:00
Tim Hockin
32bb3ae8f1 Merge pull request #7775 from simon3z/cloud-provider-id 
api: add the ProviderID attribute to NodeSpec
 2015-05-28 15:54:00 -07:00
Tim Hockin
081ab3abac Merge pull request #8853 from caesarxuchao/HostToNodeName 
update PodSpec.Host to PodSpec.NodeName
 2015-05-28 15:50:12 -07:00
Tim Hockin
72c2e3b8a1 Merge pull request #8944 from krousey/go-restful_update 
Update go-restful to get stable sorting in spec
 2015-05-28 15:29:43 -07:00
Tim Hockin
1087c12e63 Merge pull request #8909 from wojtek-t/fix_example_selflinks 
Fix selfLinks in test examples to v1beta3
 2015-05-28 15:01:02 -07:00
Tim Hockin
6fbaefdced Merge pull request #8897 from pweil-/reduce-merge-logging 
reduce merge logging
 2015-05-28 15:00:45 -07:00
Chao Xu
9c1153322e update PodSpec.Host to PodSpec.NodeName in /pkg/api/types.go and /pkg/api/v1beta3/types.go 2015-05-28 14:10:06 -07:00
Kris Rousey
05eaaa99e1 Update go-restful to get stable sorting in spec 2015-05-28 13:40:23 -07:00
Federico Simoncelli
2a89428d44 api: add the ProviderID attribute to NodeSpec 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-05-28 13:01:58 -04:00
Wojciech Tyczynski
22f7f05135 Fix selfLinks in examples 2015-05-28 16:47:53 +02:00
Wojciech Tyczynski
33318f0162 Use generated DeepCopy methods. 2015-05-28 09:03:27 +02:00
Paul Weil
ae981b73a3 reduce merge logging 2015-05-27 19:12:04 -04:00
markturansky
60b9652500 added generated deep copy funcs 2015-05-27 13:58:29 -04:00
markturansky
d338a7eaea rebased and added 'omitempty' to new volumes 2015-05-27 13:21:48 -04:00
markturansky
e15fd2b0e7 normalized omitempty across volumes for all versions 2015-05-27 13:13:19 -04:00
markturansky
f7ede60045 normalized json tags across volumes 2015-05-27 13:12:40 -04:00
Tim Hockin
b8a808b1ae Merge pull request #8592 from RichieEscarez/5057_restartpolicy_default 
5057 restartpolicy default
 2015-05-27 09:40:34 -07:00
Tim Hockin
a15c69798b Merge pull request #8582 from deads2k/add-pull-secrets-to-service-account 
add pull secrets to service accounts
 2015-05-27 08:40:46 -07:00
Tim Hockin
57df04ed72 Merge pull request #8149 from pmorie/container-env-resolution 
Expand variables in containers' env, cmd, args
 2015-05-27 08:37:02 -07:00
Tim Hockin
d0249aac75 Merge pull request #8133 from markturansky/iscsi_pv2 
added ISCSI volume plugin to PersistentVolumeSource
 2015-05-27 08:36:37 -07:00
Paul Morie
8b338860aa Make kubelet expand var refs in cmd, args, env 2015-05-27 00:13:57 -04:00
Wojciech Tyczynski
e7dbac53cb Generate DeepCopy methods 2015-05-26 21:17:11 +02:00
Wojciech Tyczynski
b2280db724 Deep-copy functions autogeneration. 2015-05-26 21:16:26 +02:00
Marek Grabowski
f5a3f7d17f Merge pull request #8721 from smarterclayton/incorrect_description 
Description of ImagePullPolicy wrong in v1(beta3)
 2015-05-25 10:50:44 +02:00
Clayton Coleman
3db9f0528a Description of ImagePullPolicy wrong in v1(beta3) 2015-05-22 19:35:26 -04:00
Justin Santa Barbara
ada6882373 Add conversions for CreateExternalLoadBalancer for v1beta1 and v1beta2 2015-05-22 19:26:54 -04:00
Justin Santa Barbara
19c0d82edc Include the actual failing value in a validation error message 2015-05-22 19:14:28 -04:00
Justin Santa Barbara
a271771341 Richer errors for validation 2015-05-22 19:14:28 -04:00
Justin Santa Barbara
9255770068 Fix a few occurences of old language (e.g. visibility -> ServiceType) 2015-05-22 19:14:28 -04:00
Justin Santa Barbara
7346cc8042 Add ServiceType = NodePort; wire everything up 2015-05-22 19:14:28 -04:00
Justin Santa Barbara
3bb2fe2425 Create port allocator, based on IP allocator mechanism 
Including some refactoring of IP allocator
 2015-05-22 19:14:28 -04:00
Justin Santa Barbara
e49ad95462 Mark PublicIPs as deprecated & rename to DeprecatedPublicIPs in the latest API 
We need to keep them in the API so that we can round-trip between versions.
 2015-05-22 19:14:27 -04:00
Justin Santa Barbara
2197c8da5a Add NodePort to ServicePort 
We prevent it from being set by validation
 2015-05-22 19:14:27 -04:00
Justin Santa Barbara
973c2e4819 Add Type to ServiceSpec: ClusterIP or LoadBalancer 2015-05-22 19:14:21 -04:00
Justin Santa Barbara
3884d5fc59 Add LoadBalancer status to ServiceStatus 
This will replace publicIPs
 2015-05-22 18:27:05 -04:00
Dawn Chen
677a4aa1a7 Merge pull request #8164 from cjcullen/cloudprovider 
Route creation reconciler loop.
 2015-05-22 12:27:50 -07:00
markturansky
77c39edcc9 rebased and regenerated conversions 2015-05-22 15:18:48 -04:00
markturansky
5b23fc39b2 added ISCSI volume plugin to PersistentVolumeSource 2015-05-22 15:18:20 -04:00
Dawn Chen
434a9ff57b Merge pull request #8552 from thockin/rc-default-1 
Change v1 API to default RC replicas to 1
 2015-05-22 11:10:01 -07:00
deads2k
590bd048a5 add pull secrets to service accounts 2015-05-22 14:05:19 -04:00
RichieEscarez
0076c181c7 Edited to add the default restart policy (always) to clarify value if RestartPolicy is not set. 
Generated new .json output for Swagger UI

Added the api/v1/v1.json file to the hack/update-swagger-spec.sh script so it gets updated and built.

Fixes #5057

Reverting last change: Deleted line for building v1 api from the  build file update-swagger-ui.sh and deleted the output file from build (v1.json).
 2015-05-22 10:03:12 -07:00
Tim Hockin
fd07de6ed6 Change v1 API to default RC replicas to 1 2015-05-21 12:40:59 -07:00
Huamin Chen
4a800fd10e add rados block device(rbd) volume plugin 
Signed-off-by: Huamin Chen <hchen@redhat.com>
 2015-05-21 14:51:31 -04:00
Derek Carr
9b1fb6dca1 Merge pull request #8233 from csrwng/connect_adm_ctrl 
Admission control to prevent exec on privileged pods
 2015-05-21 14:35:28 -04:00
Cesar Wong
328b1d0817 Add admission control to the Connect method in the API Server 
The resource passed to admission control is a ConnectRequest object
which includes additional information about the current request.
 2015-05-21 13:54:45 -04:00
Wojciech Tyczynski
de0a1d179f Fix ordering of conversion methods. 2015-05-21 19:41:48 +02:00
Dawn Chen
0710976d43 Merge pull request #8490 from thockin/diff-proto 
Allow same-hostport-different-protocol
 2015-05-21 09:16:16 -07:00
Dawn Chen
ad47b2d29d Merge pull request #8483 from liggitt/etcd_test 
Update generic etcd tests for cluster-scoped objects
 2015-05-21 09:13:44 -07:00
Dawn Chen
9f4fb35c16 Merge pull request #8472 from nikhiljindal/statusName 
v1: Updating StatusDetails.ID to Name
 2015-05-21 09:12:42 -07:00
CJ Cullen
bf646abf8d Revert "Revert "Modify nodes to register directly with the master."" 
This reverts commit c53786ab31.
 2015-05-20 14:21:03 -07:00
Quinton Hoole
c53786ab31 Revert "Modify nodes to register directly with the master." 2015-05-20 13:47:51 -07:00
nikhiljindal
e92a42b57f Renaming StatusDetails.ID to Name 2015-05-20 11:35:38 -07:00
Yu-Ju Hong
8f62dd2451 Merge pull request #8482 from smarterclayton/serialization_wrong 
Serialization of 'IP' in endpoints should be 'ip'
 2015-05-19 12:02:19 -07:00
Tim Hockin
97abc19810 Merge pull request #8299 from thockin/import-names 
rename imported pkgs for readability
 2015-05-19 12:01:57 -07:00
Eric Tune
1f4172d23c Merge pull request #6949 from roberthbailey/node-register 
Modify nodes to register directly with the master.
 2015-05-19 11:29:43 -07:00
Tim Hockin
cb49843ccb Merge pull request #8140 from vishh/namespace 
Update Namespace names to follow DNS label format
 2015-05-19 11:25:32 -07:00
Tim Hockin
70c94fad6d Don't rename api imports in conversions 2015-05-19 11:21:21 -07:00
Tim Hockin
d689ba9b01 Rename versioned pkg imports in defaults tests 2015-05-19 11:18:55 -07:00
Vishnu Kannan
d10af89493 Updating namespaces to be DNS labels instead of DNS names. 2015-05-19 11:09:09 -07:00
Daniel Smith
181124bc9b Merge pull request #7974 from deads2k/attach-pull-secrets-to-pods 
Attach pull secrets to pods
 2015-05-19 10:26:39 -07:00
Tim Hockin
711fa2f2c6 fix 2015-05-19 10:17:53 -07:00
Tim Hockin
c7bf373d98 Allow same-hostport-different-protocol 2015-05-19 10:00:35 -07:00
Robert Bailey
01467e0bb8 Modify nodes to register directly with the master. 
- Delete nodes when they are no longer ready and don't exist in the
cloud provider.
 - Label each node with it's hostname.
 - Add flag to skip node registration.
 - Add a test for registering an existing node.
 2015-05-19 09:55:07 -07:00
Brian Grant
2c81050e6f Merge pull request #8457 from davidopp/master 
Fix stylistic isues with #5547. Closes #4910.
 2015-05-19 07:43:21 -07:00
deads2k
5458f05679 create LocalObjectReference 2015-05-19 08:39:46 -04:00
David Oppenheimer
44b1e1ca0c Fix stylistic isues with #5547. Closes #4910. 2015-05-18 23:32:06 -07:00
Jordan Liggitt
a6401fa433 Update generic etcd tests for cluster-scoped objects 2015-05-18 23:17:51 -04:00
Clayton Coleman
2e8b7f9797 Serialization of 'IP' should be 'ip' 
CamelCase rules are "initialsUpperCase"
 2015-05-18 22:56:12 -04:00
Brian Grant
03535478a2 Merge pull request #8440 from thockin/api-type-names 
Rename a few API types (non-breaking change)
 2015-05-18 18:48:16 -07:00
Tim Hockin
65833e42c4 rename CapabilityType Capability 2015-05-18 17:21:30 -07:00
Tim Hockin
fd22f48f5b rename StorageType StorageMedium 2015-05-18 17:21:30 -07:00
Tim Hockin
f66ca25d9f Rename AccessMode to PersistentVolumeAccessMode 2015-05-18 17:21:30 -07:00
Tim Hockin
a548d542db Rename AffinityType to ServiceAffinity 2015-05-18 17:21:30 -07:00
Wojciech Tyczynski
9a93206774 Script for automatically generate conversions. 2015-05-19 02:17:58 +02:00
deads2k
0c14e0cbdb add pull secret references to pods 2015-05-18 16:18:16 -04:00