Commit Graph

6197 Commits (2337daf1f605a3ca6a72524d850ff4c7e1eb2b64)

Author SHA1 Message Date
Alex Robinson 68bbf6c129 Merge pull request #10447 from feihujiang/helpfulErrorForUnsupportedVersion
Provide more helpful error when using unsupported api version
2015-06-29 15:00:58 -07:00
Alex Robinson 5d13e78572 Merge pull request #9781 from andronat/5840_yaml_2
Fixes ignored objects in one YAML file
2015-06-29 14:29:59 -07:00
Alex Robinson b758be0daf Merge pull request #9047 from kazegusuri/allocator_test
add unit test for allocator
2015-06-29 14:11:48 -07:00
Anastasis Andronidis 697e07f864 Correctly parse multiple resources from files
Refactored how files, directories and stdin are handled. Every file must pass
through the FileVisitor and then streamed through StreamVisitor. FileVisitor
takes care of opening/closing files and StreamVisitor is parsing multiple
resources.
2015-06-29 23:11:46 +02:00
Alex Robinson b3aad24d40 Merge pull request #10414 from swagiaal/iscsi-print-error
iscsi plugin: print error messages not just exit status.
2015-06-29 14:06:09 -07:00
Alex Robinson 10a0dc9aae Merge pull request #9928 from jlowdermilk/version-negotiate-tests
Unittest for #9762
2015-06-29 13:34:13 -07:00
Alex Robinson 83f0bd668c Merge pull request #10427 from lavalamp/etcdChanFix
Don't block etcd client
2015-06-29 13:28:48 -07:00
Chao Xu 9b3d42c090 Add command "kubectl replace". "kubectl update" is still supported as an alias.
"kubectl replace --patch" is NOT supported. It's moved to "kubectl patch" as a separate command in another commit.
2015-06-29 12:14:24 -07:00
Yu-Ju Hong de75a42cb2 Add a kubelet /runningpods endpoint
/runningpods returns a list of pods currently running on the kubelet. The list
is composed by examining the container runtime, and may be different from the
desired pods to run known by kubelet.

This is useful for tests to verify that pods are indeed deleted on nodes.
2015-06-29 11:29:23 -07:00
Alex Robinson 21f750fdc3 Merge pull request #10287 from wojtek-t/changes_to_registry
Remove some dead code
2015-06-29 11:02:41 -07:00
Alex Robinson 143bfeb40e Merge pull request #10471 from bprashanth/master_list
Kubelet doesn't fight apiserver for cputime on the master.
2015-06-29 10:22:00 -07:00
Alex Robinson fa1d0e59e8 Merge pull request #10422 from bcbroussard/gauge-colors
Update Web UI Bar Gauge Graphs
2015-06-29 09:25:47 -07:00
Sami Wagiaalla a317b5ffc8 iscsi plugin: print error messages not just exit status.
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
2015-06-29 11:28:56 -04:00
feihujiang 878a72228f Provide more helpful error when using unsupported api version 2015-06-29 15:32:54 +08:00
Tim Hockin 025f728e50 Fix 'a' vs 'an' 2015-06-28 20:51:36 -07:00
Prashanth Balasubramanian 029e0ad350 Kubelet doesn't fight apiserver for cputime on the master. 2015-06-28 19:53:35 -07:00
hurf b13d29fbe8 Display namespace while describing resources.
Display namespace while describing pod, rc, secret, service,
serviceAccount, limitRange, resourceQuota and pvc.

For containers and events are always displayed with other
resources, it's not necessary to show namespace for them.
2015-06-29 09:17:12 +08:00
Tim Hockin 08f66f04d6 Fix error message 2015-06-28 14:49:38 -07:00
Robert Bailey 6b97ac0880 Merge pull request #10131 from thockin/svc-docs
Hopefully make NodePort docs clearer
2015-06-26 21:50:46 -07:00
Robert Bailey ed03973ae0 Merge pull request #10269 from nikhiljindal/eventsErrors
Returning api/errors from event/rest.go
2015-06-26 17:12:09 -07:00
Robert Bailey 8ee63307e4 Merge pull request #9958 from smarterclayton/use_copier
Use runtime.Copier instead of hardcoding api.Scheme
2015-06-26 17:11:48 -07:00
Daniel Smith 45ac0cf25e Don't block etcd client 2015-06-26 14:27:13 -07:00
BC Broussard 2f43fc72db Update Web UI Bar Gauge Graphs
- Changed file system abbreviation from 'FS' to Filesystem
- Made chart height dynamic and incorporated legend height change into the master code/datafile.go binary
- Updated the max colors for the graph
- Realigned graph numbers
2015-06-26 13:52:08 -07:00
nikhiljindal 7b56d89e80 Returning api/errors from event 2015-06-26 13:51:55 -07:00
Robert Bailey f9db614f95 Merge pull request #10234 from mikedanese/rolling-update-weird
Detect if replicas have been defaulted in rolling-update and use old replica count
2015-06-26 12:54:35 -07:00
Clayton Coleman 6970dda54e Use runtime.Copier instead of hardcoding api.Scheme
Allow other schemes to be supported by etcd_helper.go

runtime.Scheme.Copy() should be using the built in DeepCopy()
2015-06-26 14:50:33 -04:00
Robert Bailey 8ebd896351 Merge pull request #10274 from brendandburns/release-0.20
Release 0.20
2015-06-26 11:34:10 -07:00
Robert Bailey 508f7f1697 Merge pull request #10358 from caesarxuchao/add-force-update
Add --force to `kubectl update`
2015-06-26 10:49:04 -07:00
Robert Bailey 54a3ebef3c Merge pull request #10315 from nikhiljindal/invalidValue
Updating the "invalid value" error message to include the list of valid values
2015-06-26 10:46:59 -07:00
Robert Bailey 0048eae8eb Merge pull request #9965 from stevekuznetsov/skuznets/allow-https
Allowing for HTTPS Probes
2015-06-26 10:43:37 -07:00
Wojciech Tyczynski 4c4d59a236 Increase the length of sliding window for latency metrics 2015-06-26 13:08:21 +02:00
Brendan Burns 8972a4865b Kubernetes version v0.20.0-dev 2015-06-25 20:10:17 -07:00
Brendan Burns c17a15a0cb Kubernetes version v0.20.0 2015-06-25 20:08:58 -07:00
Maxwell Forbes 712f303350 Merge pull request #9736 from sdminonne/bug_fix2
To add validation for service ports when defined as string
2015-06-25 19:37:04 -07:00
Chao Xu ef5de91fd7 add "--force" flag to "kubectl update";
update relevant tests
2015-06-25 17:16:20 -07:00
Maxwell Forbes 03121c2536 Merge pull request #10252 from akramer/patch-1
Fixing spacing in documentation comments
2015-06-25 15:09:41 -07:00
Steve Kuznetsov 3008ff6150 Changed HTTPGetAction to allow user-defined schemes 2015-06-25 16:59:12 -04:00
Maxwell Forbes 5e748c1d47 Merge pull request #10070 from lavalamp/e2eProxyFix
proxy e2e test improvements
2015-06-25 13:15:03 -07:00
nikhiljindal 3b3ee0ed77 Improving an error message 2015-06-25 13:08:09 -07:00
Sami Wagiaalla 4a6a492281 Use instance availability zone for AWS EBS
Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
2015-06-25 16:00:30 -04:00
Mike Danese 0c8f71aa0b make rolling update check if the replication controller has been defaulted 2015-06-25 12:29:21 -07:00
Mike Danese f79736d767 make replicas a pointer in v1beta3 api 2015-06-25 11:53:18 -07:00
Mike Danese 2906f85227 allow conversions.Scheme to expose intermidiate versioned api object 2015-06-25 11:53:17 -07:00
Maxwell Forbes a526e6ddb4 Merge pull request #10332 from dchen1107/cleanup
Include PodStatus.Message and PodStatus.Reason when kubectl describe …
2015-06-25 10:57:31 -07:00
Maxwell Forbes d90895adfd Merge pull request #10221 from feihujiang/addSourceForErrorFromServerMessage
Add source in “error from server” message when using kubectl
2015-06-25 10:56:46 -07:00
Tim Hockin ff91fef26b Hopefully make NodePort docs clearer 2015-06-25 10:46:15 -07:00
Maxwell Forbes 1904d4e1ce Merge pull request #10330 from brendandburns/addon
Use the namespace of the pod when creating the mirror.
2015-06-25 10:04:25 -07:00
Maxwell Forbes 655179dcfb Merge pull request #10264 from mikedanese/ca-token
add ca cert to token controller and all service accounts
2015-06-25 09:56:35 -07:00
Maxwell Forbes fc349fdd47 Merge pull request #10060 from nikhiljindal/scopeParamPath
Updating the path param name to "namespace" instead of "namespaces"
2015-06-25 09:56:15 -07:00
Maxwell Forbes 2bb4cf3f8f Merge pull request #10266 from ArtfulCoder/kubelet_resolv
update docker's resolv.conf file with options ndots:5
2015-06-25 09:54:36 -07:00
Abhishek Shah 23caf446ae update docker's resolv.conf file with options ndots:5 2015-06-24 23:33:58 -07:00
feihujiang b41b53122a Add source in “error from server” message when using kubectl 2015-06-25 14:20:09 +08:00
Dawn Chen 0a369fead6 Include PodStatus.Message and PodStatus.Reason when kubectl describe pods 2015-06-24 23:07:20 -07:00
Brendan Burns c669fe300c Use the namespace of the pod when creating the mirror. 2015-06-24 21:49:40 -07:00
Maxwell Forbes 3afda5d566 Merge pull request #10312 from dchen1107/cleanup
Take 2: Fix the race between configuring cbr0 and restarting static pods
2015-06-24 17:59:50 -07:00
Maxwell Forbes 28946766a3 Merge pull request #9807 from krousey/container_manifest
Removing ContainerManifest
2015-06-24 17:55:29 -07:00
Dawn Chen 710fb4e413 add iptables rule for MASQUERADE for egress 2015-06-24 17:19:57 -07:00
Maxwell Forbes e44f61993b Merge pull request #9304 from jsdir/master
Show resource limits with describe
2015-06-24 16:44:53 -07:00
Yu-Ju Hong f7fd7e9687 Kubelet: add and modify some logging messsages
This helps debug #6651
2015-06-24 16:29:19 -07:00
Justin Santa Barbara 4461daa218 AWS: Enabling resize tests 2015-06-24 19:01:42 -04:00
Mike Danese 5760fe1957 use ca.crt as client certificate authority for inClusterConfig 2015-06-24 15:10:20 -07:00
Mike Danese 56bde3342a add ca to token controller and all service accounts 2015-06-24 15:10:20 -07:00
Maxwell Forbes befe545033 Merge pull request #10253 from yifan-gu/log
kubelet/status_manager: Small logging fix.
2015-06-24 15:01:40 -07:00
Daniel Smith 689a3ee7a2 Make UI work through kubectl proxy (again)
Fixes #10115.
2015-06-24 13:54:14 -07:00
Daniel Smith ddbe4c914f Fix proxy rewriting 2015-06-24 13:54:14 -07:00
akramer 5f44175dc4 Fixing spacing in documentation comments
There was some ugly spacing in the 'kubectl exec' documentation comments, I've fixed it and wrapped it to 80 chars.
2015-06-24 13:50:30 -07:00
nikhiljindal 6c6398edaa Update the path param name to namespace instead of namespaces 2015-06-24 13:45:49 -07:00
Maxwell Forbes 060cb43785 Merge pull request #10134 from brendandburns/gongysh2004-nodeport
Fix the warning when you create an externalized service
2015-06-24 13:21:27 -07:00
Maxwell Forbes 461fc2b01b Merge pull request #10277 from brendandburns/health
Switch to using the official etcd health check.
2015-06-24 11:45:51 -07:00
Kris Rousey d13421e084 Removing ContainerManifest 2015-06-24 11:31:34 -07:00
Dawn Chen 6ddfa512de Revert "Revert "Fix the race between configuring cbr0 and restarting static pods""
This reverts commit fd0a95dd12.
2015-06-24 11:10:10 -07:00
Maxwell Forbes 11f9fd1dcd Merge pull request #10074 from nikhiljindal/retryUpdate
Allow update without resource version
2015-06-24 10:55:41 -07:00
Brendan Burns f4e97be78e Switch to using the official etcd health check. 2015-06-24 10:18:39 -07:00
Wojciech Tyczynski f6153445f1 Remove dead code 2015-06-24 15:14:33 +02:00
Piotr Szczesniak fd0a95dd12 Revert "Fix the race between configuring cbr0 and restarting static pods" 2015-06-24 09:56:49 +02:00
Daniel Smith bee68e48cd Have client store status code in Result 2015-06-23 18:48:01 -07:00
Jeff Lowdermilk f4e7b5480d Merge pull request #10249 from mikedanese/unlink-test-libs
unlink testlibs from kube-apiserver and kubelet, remove test flags
2015-06-23 17:16:31 -07:00
Jeff Lowdermilk 838ddba1d9 Merge pull request #10188 from fabianofranz/fix_kubectl_set_credentials_example
Fixes wrong "kubectl config set-credentials" examples
2015-06-23 17:11:40 -07:00
Jeff Lowdermilk 50d50a3cb8 Merge pull request #10211 from dchen1107/cleanup
Fix the race between configuring cbr0 and restarting static pods
2015-06-23 17:09:01 -07:00
Dawn Chen 9dbe6fe4e4 Added more comments. 2015-06-23 16:28:41 -07:00
Jeff Lowdermilk 50e67d4034 Merge pull request #10216 from wojtek-t/reset_metrics
Expose /resetMetrics handle in apiserver
2015-06-23 16:07:41 -07:00
Jeff Lowdermilk 6dc6992023 Merge pull request #10192 from nikhiljindal/etcdError
Updating the error message to say node instead of minion
2015-06-23 15:48:53 -07:00
Jeff Lowdermilk d212ea17cd Merge pull request #10182 from bprashanth/kubelet_status
Fix kubelet deadlock
2015-06-23 15:40:49 -07:00
Jeff Lowdermilk 141eba39e9 Merge pull request #9975 from derekwaynecarr/admission_name
Admission control attributes has access to resource name
2015-06-23 14:30:45 -07:00
Jeff Lowdermilk 9b1b72ea49 Merge pull request #10147 from bprashanth/sync_rc
Prevent restarts of kube-controller from overshooting and correcting replicas
2015-06-23 14:17:56 -07:00
Yifan Gu 384f022681 kubelet/status_manager: small logging fix. 2015-06-23 13:49:34 -07:00
Dawn Chen 23200d303f Fix several issues on running syncPods until network is configured.
Also fixed unittests and compiling.
2015-06-23 12:11:19 -07:00
Mike Danese 06c35a177c unlink testlibs from kube-apiserver and kubelet 2015-06-23 12:04:05 -07:00
derekwaynecarr f6fb72ec51 Admission control attributes has access to resource name 2015-06-23 13:54:55 -04:00
Jeff Lowdermilk 5e25827919 Merge pull request #10204 from caesarxuchao/pr/9754/head
Continue on #9754, Improvements to the guestbook README, switch to .yaml files
2015-06-23 09:44:06 -07:00
Wojciech Tyczynski 23d405ad86 Expose /resetMetrics handle in apiserver 2015-06-23 11:12:45 +02:00
nikhiljindal 221ae4d63b Allow update without resource version 2015-06-23 00:16:08 -07:00
Brendan Burns 192ffdfb25 Fix the container bridge so that it can create cbr0
Fix the kubelet so that it tries to sync status, even if Docker is down
2015-06-22 23:18:01 -07:00
Chao Xu 59b654c996 fix tests for 22f1b07858 2015-06-22 17:10:09 -07:00
Jeff Lowdermilk 19991d5315 Merge pull request #10193 from zmerlynn/merge-release-0.19-to-master
Merge release 0.19.3 to master
2015-06-22 13:58:56 -07:00
Prashanth Balasubramanian af175cc00b Add a pod status equality method to the status manager. 2015-06-22 13:49:49 -07:00
fabianofranz fae27669aa Fixes kubectl config set-credentials examples 2015-06-22 17:34:04 -03:00
Zach Loafman 4274fccbc5 Merge remote-tracking branch 'upstream/release-0.19' into merge-release-0.19-to-master 2015-06-22 13:32:37 -07:00
Jeff Lowdermilk 7002ce2336 Merge pull request #10148 from mikedanese/log-service-account
log a message when we fall back to service account
2015-06-22 13:20:43 -07:00
Jeff Lowdermilk cbf0a4f2db Merge pull request #10152 from markturansky/pv_recycler_precision_fix
Fixed PV recycler ActiveDeadlineSeconds precision
2015-06-22 13:17:03 -07:00
Jeff Lowdermilk 0c7fbacfb1 Merge pull request #10052 from derekwaynecarr/admission_subresources
Admission control exposes subresource
2015-06-22 13:11:58 -07:00
Jeff Lowdermilk 1874599c00 Merge pull request #8947 from bcbroussard/services-nodeport
Update the services web ui for nodeport and loadbalancer
2015-06-22 13:11:34 -07:00
nikhiljindal 4e02aef87d Updating the error message to say node instead of minion 2015-06-22 12:52:14 -07:00
Jeff Lowdermilk b7583b799f Merge pull request #10151 from brendandburns/explore
Remove some dead code.
2015-06-22 12:02:05 -07:00
Jeff Lowdermilk d0fc0d884d Merge pull request #9876 from andronat/9631_labelcolumn
Printing resource labels as columns
2015-06-22 11:55:26 -07:00
Zach Loafman 5534a8ca81 Revert "Release 0.19.3" 2015-06-22 10:56:38 -07:00
Robert Bailey 8a73b13859 Merge pull request #10184 from zmerlynn/release-0.19
Release 0.19.3
2015-06-22 10:56:18 -07:00
Jeff Lowdermilk 85770295c2 Merge pull request #10004 from ArtfulCoder/kubelet_health
Augmented kubelet healthz with syncLoop check.
2015-06-22 10:53:05 -07:00
Zach Loafman 82ae56a918 Kubernetes version v0.19.3-dev 2015-06-22 10:46:14 -07:00
Zach Loafman 3103c8ca0f Kubernetes version v0.19.3 2015-06-22 10:46:14 -07:00
Zach Loafman 0e30307512 Kubernetes version v0.19.2-dev 2015-06-22 10:43:26 -07:00
Zach Loafman c3331c4f34 Kubernetes version v0.19.2 2015-06-22 10:43:25 -07:00
Jeff Lowdermilk 0f59847cc5 Merge pull request #9905 from justinsb/aws_ssh_user
Don't assume we always SSH as the current user
2015-06-22 10:37:07 -07:00
Jeff Lowdermilk 2418173784 Merge pull request #9963 from smarterclayton/add_options_to_proxy
OPTIONS should be passed through the proxy
2015-06-22 10:36:25 -07:00
Prashanth Balasubramanian 5f61392e6f Add logging to debug container runtime failures 2015-06-22 10:22:35 -07:00
Prashanth Balasubramanian 64ad3e17ad Fix deadlock 2015-06-22 10:22:35 -07:00
Prashanth Balasubramanian 4b990d128a Don't flood the status manager with updates from multi-container pods 2015-06-22 10:22:28 -07:00
Salvatore Dario Minonne 4b13faa346 To add validation for service ports when defined as string (fixing issue #9734) 2015-06-22 17:21:51 +02:00
Anastasis Andronidis b06ef70057 Print resource labels as columns 2015-06-22 00:44:51 +02:00
Anastasis Andronidis 101739a6be Added Reason in PodStatus 2015-06-21 17:05:34 +02:00
Justin Santa Barbara c5f9085398 Mark realSSHDialer as implementing sshDialer 2015-06-20 18:18:38 -04:00
Justin Santa Barbara efdd03a6a9 Don't assume we always SSH as the current user
This works on gcloud (where the user is dynamically created by the tool),
but doesn't hold on other clouds (e.g. AWS).

The function in pkg/util now takes a user arg, and it is called only
from the e2e tests, which now check for env-var KUBE_SSH_USER, and then
fall back to the existing behaviour of env-var USER.

I am using this from Jenkins by directly setting the env-var:

export KUBE_SSH_USER=jenkins
...
hack/jenkins/e2e.sh
2015-06-20 18:18:38 -04:00
markturansky 39c5152e2c fixed pv recycler timeout precision 2015-06-20 00:34:29 -04:00
Brendan Burns 26b682d6a0 Remove some dead code. 2015-06-19 21:32:13 -07:00
Prashanth Balasubramanian 35950c04ff Avoid syncing rcs till the pods controller has synced. 2015-06-19 18:20:28 -07:00
Abhishek Shah 3556993179 Augmented kubelet healthz with syncLoop check.
Monit uses read-only port for health monitoring.
2015-06-19 18:14:01 -07:00
Mike Danese 0da17683f0 log a message when we fall back to service account 2015-06-19 17:52:38 -07:00
Satnam Singh 29ffee51a8 Merge pull request #10102 from mikedanese/kubeconfig-bug-fix
make clientcmd use inClusterConfig only if no other configs are available
2015-06-19 16:45:33 -07:00
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 2012238204 Merge pull request #9457 from yujuhong/seen
Kubelet: record the initial pod processing latency
2015-06-19 15:24:16 -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
Satnam Singh b05bd0c59f Merge pull request #10105 from caesarxuchao/fix-9287
exclude the port number when checking a request in "kubectl proxy"
2015-06-19 15:16:38 -07:00
Brendan Burns f0ff1927f1 Fixup port printing. 2015-06-19 15:10:22 -07:00
Satnam Singh 90a7d41dcf Merge pull request #10113 from eparis/bash-comp-logs
kubectl log->logs in bash completions
2015-06-19 14:55:47 -07:00
gong yong sheng 3a598eba0e Use NodePort instead Port, firewalls install firewall. 2015-06-19 14:48:43 -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 d96a9a1c0a Merge pull request #9862 from fgrzadkowski/bump_ectd_client
Bump ectd client and fix initializing IP/Port allocators when etcd is not reachable
2015-06-19 14:22:47 -07:00
Eric Paris f40fce4598 kubectl log->logs in bash completions
The kubectl log command switched to logs. But the bash completions code
was still looking for a singular
2015-06-19 16:00:58 -04:00
Jordan Liggitt 1ee5578146 Ensure service account does not exist before deleting added/updated tokens 2015-06-19 15:43:19 -04:00
Jordan Liggitt e563727338 Add logging for invalid JWT tokens 2015-06-19 15:43:19 -04:00
Mike Danese c93a7d644c make clientcmd use inClusterConfig only if no other configs are available 2015-06-19 12:41:10 -07:00
Filip Grzadkowski 4c0c7dd879 Fix intializing IP/Port allocators when etcd is not reachable. 2015-06-19 21:20:52 +02:00
Yu-Ju Hong f96a8d0935 Kubelet: record the initial pod processing latency
Add a new latency metric for the time from seeing the pod for the first time
to starting a pod worker for it.

Also, change PodStartLatency to include this initial processing latency.
2015-06-19 12:07:55 -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
Satnam Singh 0f55103512 Merge pull request #9346 from yifan-gu/cleanup_kubelet_tests
kubelet: clean up tests
2015-06-19 11:42:53 -07:00
Clayton Coleman 83f84a9821 OPTIONS should be passed through the proxy 2015-06-19 14:30:27 -04:00
Chao Xu 9449a61b1a exclude the port number when checking a request in "kubectl proxy" 2015-06-19 11:00:01 -07:00
Robert Bailey abac8c86c7 Merge pull request #10096 from brendandburns/merge-release-0.19-to-master
Merge release 0.19.1 to master
2015-06-19 10:36:09 -07:00
Yifan Gu 40e46bbb37 kubelet: Remove newTestKubeletWithFakeRuntime() and other depreciated functions.
This cleans up the kubelet tests. Almost no docker specified tests now.
2015-06-19 10:28:27 -07:00