k8s-merge-robot
7fa85d430b
Merge pull request #16614 from pmorie/ro-managed
...
Auto commit by PR queue bot
2015-11-16 10:46:44 -08:00
Jordan Liggitt
165d7d5030
Enable specifying scheme/port for metrics client
2015-11-16 13:18:40 -05:00
Mike Danese
f674109502
daemonset shouldn't place onto unschedulable nodes
2015-11-16 10:17:40 -08:00
k8s-merge-robot
65c285f5ab
Merge pull request #16344 from thockin/enable-iptables-proxy
...
Auto commit by PR queue bot
2015-11-16 09:48:38 -08:00
k8s-merge-robot
ebe5649939
Merge pull request #16824 from mattmoor/master
...
Auto commit by PR queue bot
2015-11-16 09:12:35 -08:00
k8s-merge-robot
89d7309c88
Merge pull request #16256 from mikedanese/daemon-gls
...
Auto commit by PR queue bot
2015-11-16 07:59:28 -08:00
k8s-merge-robot
6d8296a312
Merge pull request #16034 from mesosphere/sttts-node-lifecycle
...
Auto commit by PR queue bot
2015-11-16 07:27:25 -08:00
k8s-merge-robot
9d86d8ca1c
Merge pull request #17279 from pmorie/config-load
...
Auto commit by PR queue bot
2015-11-16 06:55:22 -08:00
k8s-merge-robot
14eae4b48e
Merge pull request #17303 from zhengguoyong/del_pod_api_selector
...
Auto commit by PR queue bot
2015-11-16 06:24:15 -08:00
deads2k
303bcad398
use groupversion in RESTMapping
2015-11-16 09:22:11 -05:00
Jordan Liggitt
b675a77213
Add groupless API server tests
2015-11-16 07:42:00 -05:00
deads2k
bf983e942c
use GroupVersion in APIGroupVersion for api installer
2015-11-16 07:42:00 -05:00
Dr. Stefan Schimanski
2f45d5706b
Add node status update controller
2015-11-16 11:48:04 +01:00
Dr. Stefan Schimanski
0c1d90bf5f
Add ListWithoutKubelet to mesos cloud provider
2015-11-16 11:48:04 +01:00
Dr. Stefan Schimanski
6a2602a51b
Make cloud provider return disappearence of slave to the node controller
...
- implement ExternalID in Mesos cloud provider. This is used by the node
controller to detect disappeared nodes.
- add test case for ExternalID
2015-11-16 11:48:04 +01:00
k8s-merge-robot
081b21687e
Merge pull request #16261 from zhengguoyong/update_condition
...
Auto commit by PR queue bot
2015-11-16 02:34:18 -08:00
zhengguoyong
d5f2bb00a7
Del unused var
2015-11-16 15:53:20 +08:00
zhengguoyong
b18a9baacc
Use small letter var definition
2015-11-16 12:12:21 +08:00
Prashanth Balasubramanian
eab22ff95a
Fix timer leak in wait.Poll
2015-11-15 16:39:25 -08:00
mqliang
d7acd3d58f
fix errror message
2015-11-15 09:49:35 +08:00
Matt Moore
b750d1dddc
Drop the beta for GCR v2 images.
...
beta.gcr.io is no longer needed to pull through v2.
2015-11-14 12:19:02 -08:00
Paul Morie
1cb58baf2f
Refactor map field handling for clientcmd.LoadFromFile
2015-11-14 09:44:31 -05:00
Janet Kuo
8e99bae7ec
Support autoscale deployments
2015-11-13 23:33:55 -08:00
Paul Morie
911757486d
Refactor volume.Builder.IsReadOnly() to volume.Builder.GetAttributes()
2015-11-13 23:34:48 -05:00
Tim Hockin
970c045848
Enable iptables kube-proxy by default in master
2015-11-13 18:38:01 -08:00
k8s-merge-robot
961a02a602
Merge pull request #17204 from thockin/airplane-rest-canonicalize
...
Auto commit by PR queue bot
2015-11-13 18:17:18 -08:00
Tim St. Clair
fbc5a7d034
Sync status to new mirror pods
2015-11-13 18:09:17 -08:00
nikhiljindal
e31a08bbc1
Remove unused NodeRegexp var from master
2015-11-13 15:56:50 -08:00
Brendan Burns
fb576f30c8
Refactor an interface for style
2015-11-13 15:56:27 -08:00
Brendan Burns
749d5932f4
Switch to using the real metadata validate function
2015-11-13 15:29:34 -08:00
derekwaynecarr
138315266d
Improve describe for LimitRange resource based on user feedback
2015-11-13 17:02:54 -05:00
Fabiano Franz
cb3bfbc757
Debug filename in config loader
2015-11-13 16:17:59 -05:00
hurf
ca300c180c
Add printer options to Annotate
...
1. add return message as "resource name annotated"
2. add printer options to annotate
3. move all parameter into AnnotateOptions to make sure runT
function has no parameter.
2015-11-14 03:07:21 +08:00
Mike Danese
066d13d047
autogenerated
2015-11-13 10:37:46 -08:00
Mike Danese
7a7f31ead1
move daemonset to generalized label selector
2015-11-13 10:31:50 -08:00
Yu-Ju Hong
ac778e8203
Adjust the sync/backoff period
...
Set resyncInterval to one minute now that we rely on the generic pleg to trigger
pod syncs on container events. When there is an error during syncing, pod
workers need to wake up sooner to retry. Set the sync error backoff period to
10 second in this case.
2015-11-13 09:57:25 -08:00
Yu-Ju Hong
bc6414a873
kubelet: add a generic pod lifecycle event generator
...
This change introduces pod lifecycle event generator (PLEG), and adds a generic
PLEG. The generic PLEG relies on relisting to discover container events, and is
container-runtime-agnostic. Both docker and rkt are changed to use generic
PLEG.
2015-11-13 09:55:36 -08:00
Yu-Ju Hong
3beae6b70b
Add Status in the runtime Container type
...
This is necessary for the generic PLEG to distinguish container events.
2015-11-13 09:55:36 -08:00
David Eads
486103d887
Revert "use GroupVersion in APIGroupVersion for api installer"
2015-11-13 12:55:08 -05:00
deads2k
3c725f17ea
use GroupVersion in APIGroupVersion for api installer
2015-11-13 09:00:04 -05:00
k8s-merge-robot
3d123ba390
Merge pull request #16953 from swagiaal/print-cmd-in-fake-exec
...
Auto commit by PR queue bot
2015-11-13 05:21:20 -08:00
k8s-merge-robot
0bb894173c
Merge pull request #17187 from Random-Liu/deprecate-container-without-termination-message-path
...
Auto commit by PR queue bot
2015-11-13 04:49:17 -08:00
k8s-merge-robot
21dbeb5302
Merge pull request #16714 from liggitt/tolerate_exists_errors
...
Auto commit by PR queue bot
2015-11-13 03:36:16 -08:00
k8s-merge-robot
3550df30ba
Merge pull request #16855 from wojtek-t/pass_versioner
...
Auto commit by PR queue bot
2015-11-13 02:59:13 -08:00
k8s-merge-robot
e86c3de65b
Merge pull request #16633 from brendandburns/aws2
...
Auto commit by PR queue bot
2015-11-13 02:01:55 -08:00
k8s-merge-robot
dfb9ed2047
Merge pull request #17131 from pmorie/store-assert
...
Auto commit by PR queue bot
2015-11-13 00:01:13 -08:00
Wojciech Tyczynski
a5a8717539
Pass versioner to cacher.
2015-11-13 08:35:28 +01:00
k8s-merge-robot
0d9f2dc5fd
Merge pull request #17081 from yujuhong/docker_tests
...
Auto commit by PR queue bot
2015-11-12 22:56:29 -08:00
k8s-merge-robot
6ef6b9e055
Merge pull request #17054 from mesosphere/sttts-set-pod-resources
...
Auto commit by PR queue bot
2015-11-12 22:29:26 -08:00
k8s-merge-robot
6649c43bf8
Merge pull request #17049 from wojtek-t/cleanup_tools
...
Auto commit by PR queue bot
2015-11-12 21:57:23 -08:00
k8s-merge-robot
0dac3e12c5
Merge pull request #16969 from smarterclayton/fix_secret_in_container
...
Auto commit by PR queue bot
2015-11-12 21:26:20 -08: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
Alexander Hersh
0584f9ba7a
Create mirrorPod in runOnce to update API before syncPod
...
+ Fix #14992
+ "When deploying a pod using an on-disk kubelet manifest (a la /etc/kubernetes/manifests), it appears that the network plugin setUpPod is notified of the new pod before the apiserver."
2015-11-12 15:35:45 -08:00
Lantao Liu
1018d32d4f
Deprecate old containers without TerminationMessagePath label
2015-11-12 15:30:14 -08:00
k8s-merge-robot
e88593d788
Merge pull request #14542 from vishh/kubelet-refactor
...
Auto commit by PR queue bot
2015-11-12 15:24:22 -08:00
Brendan Burns
64aa189bd2
Make the AWS provider target the metadata server for local data lookup
2015-11-12 15:15:01 -08:00
k8s-merge-robot
fbbc5a85a9
Merge pull request #16782 from Random-Liu/past-active-deadline-check
...
Auto commit by PR queue bot
2015-11-12 14:01:45 -08:00
k8s-merge-robot
927f30b0a5
Merge pull request #17074 from krousey/timeout
...
Auto commit by PR queue bot
2015-11-12 11:20:34 -08:00
Wojciech Tyczynski
3df5d1dbc3
Move storage-related dirs under pkg/storage.
2015-11-12 19:49:32 +01:00
Sami Wagiaalla
4d373b133a
Handle executable not found in exec
2015-11-12 13:16:22 -05:00
k8s-merge-robot
a752dad1ba
Merge pull request #16818 from derekwaynecarr/ns_controller_race
...
Auto commit by PR queue bot
2015-11-12 09:20:20 -08:00
Dr. Stefan Schimanski
a3f02cda17
Add resource requests support
2015-11-12 16:56:07 +01: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
k8s-merge-robot
706d3a77a9
Merge pull request #16798 from derekwaynecarr/key_compaction
...
Auto commit by PR queue bot
2015-11-12 02:45:15 -08:00
k8s-merge-robot
d3f5ab5ba2
Merge pull request #15234 from justinsb/aws_normalize_interfaces
...
Auto commit by PR queue bot
2015-11-12 01:23:16 -08:00
k8s-merge-robot
b61a8fbb8a
Merge pull request #16271 from jayunit100/hammer-backoff-metrics-part1
...
Auto commit by PR queue bot
2015-11-12 00:55:37 -08:00
k8s-merge-robot
3080e7b3ca
Merge pull request #17114 from apeeyush/fix-oom-comment
...
Auto commit by PR queue bot
2015-11-12 00:32:55 -08:00
Pengcheng Tang
6d94dd1a05
Change order of CORS and authenticatedHandler for secureHandler.
2015-11-12 09:55:36 +08:00
k8s-merge-robot
398a4808e1
Merge pull request #17132 from janetkuo/kubectl-rollingupdate-rollback
...
Auto commit by PR queue bot
2015-11-11 15:52:32 -08:00
Vishnu kannan
b1770537ab
Make cadvisor startup synchronous with container runtime initialization.
...
This is hopefully a temporary workaround.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2015-11-11 15:20:13 -08:00
Vishnu kannan
4ad3d6f5fe
Move container manager into a separate package.
...
Inject container manager into Kubelet. This lets us stub out container
manager during integration testing.
2015-11-11 15:00:37 -08:00
Vishnu kannan
129dbc734c
avoid requiring runtime to be up while initializing kubelet image manager
2015-11-11 15:00:37 -08:00
Vishnu kannan
89c3cb2f43
refactor podCIDR handling in kubelet to runtime state
2015-11-11 15:00:37 -08:00
Vishnu kannan
5f4570b764
handling locks and update tests. Fail node if network is not initialized
2015-11-11 15:00:37 -08:00
Vishnu kannan
cf56f7a8ef
Refactoring kubelet to separate object creation from object logical initialization.
2015-11-11 15:00:34 -08:00
k8s-merge-robot
8761ad3ec1
Merge pull request #15464 from jiangyaoguo/bubble-up-reason-when-killing-pod
...
Auto commit by PR queue bot
2015-11-11 14:17:27 -08:00
Sami Wagiaalla
d10d81d811
Print unhandeled command in FakeExec
2015-11-11 16:54:23 -05:00
Janet Kuo
88d9106705
Add help text for rollback in kubectl rolling-update
2015-11-11 13:29:54 -08:00
Paul Morie
2377bada68
Add implements assertion for cache
2015-11-11 16:20:56 -05:00
Kris
eacf65ddce
Renaming HTTPClientFunc to CreateHTTPClient
2015-11-11 11:54:58 -08:00
Lantao Liu
d6b93cdfe1
Move active deadline check into main syncLoop of kubelet.
2015-11-11 10:05:04 -08:00
apeeyush
ae259748ef
Fix incorrect OOM score description in kubelet/qos
...
The multiplication factor is 10 and not 100 as clear from some other comments in the same file. Also mentioned at https://lwn.net/Articles/391222/ .
2015-11-11 19:12:18 +05:30
k8s-merge-robot
0ee52eb0c8
Merge pull request #17102 from zhengguoyong/add_break
...
Auto commit by PR queue bot
2015-11-11 03:57:16 -08:00
k8s-merge-robot
8c9c68c5ca
Merge pull request #15993 from timstclair/readiness-workers
...
Auto commit by PR queue bot
2015-11-11 02:49:11 -08:00
zhengguoyong
79d97abac4
When find NodeReadyCondition, it can quit the loop
2015-11-11 16:15:01 +08:00
Yu-Ju Hong
543391f1dc
Clean up unit tests using FakeDockerClient
...
Add a helper method to set the container map and list at the same time, without
having to specify them separately. This reduces the effort required for
adding/modifying tests as well as making the code more concise.
2015-11-10 16:51:35 -08:00
k8s-merge-robot
d7458ddd4c
Merge pull request #16999 from ZhuPeng/bugfix_config_setdefault
...
Auto commit by PR queue bot
2015-11-10 16:33:35 -08:00
k8s-merge-robot
685071bd4f
Merge pull request #16908 from feihujiang/printClueForGettingCommandPrompt
...
Auto commit by PR queue bot
2015-11-10 16:02:32 -08:00
Tim St. Clair
67cfed5bf3
Don't wait for sync to update readiness
...
Push status updates as soon as readiness state changes for containers,
rather than waiting for the sync loop to update the status. In
particular, this should help new containers to come online faster.
Additionally, consolidates prober test helpers into a single file.
2015-11-10 14:00:12 -08:00
Kris
4a4d195419
Exposing http.Client for configurable timeouts
2015-11-10 13:40:51 -08:00
Jeff Lowdermilk
6868382072
Reword misleading help text for kubectl patch
2015-11-10 13:00:04 -08:00
k8s-merge-robot
18c74de9a8
Merge pull request #16986 from pmorie/gce-sc
...
Auto commit by PR queue bot
2015-11-10 11:15:27 -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
k8s-merge-robot
447fe209ab
Merge pull request #17007 from zhengguoyong/fun_order_consistent
...
Auto commit by PR queue bot
2015-11-10 07:11:16 -08:00
zhengguoyong
973400a6fb
Kill TODO, rename var
2015-11-10 21:24:21 +08:00
combk8s
50ce7ff1f2
Update nodecontroller.go
2015-11-10 20:27:33 +08:00
k8s-merge-robot
7b3f37a892
Merge pull request #17003 from jiangyaoguo/fix-error-sync-pod-message
...
Auto commit by PR queue bot
2015-11-10 04:01:28 -08:00
eulerzgy
501c2825cf
Make order of fun consistent
2015-11-10 17:43:54 +08:00
eulerzgy
3f630d8ad7
when pod has successed, update condition to PodCompleted
2015-11-10 15:37:44 +08:00
ZhuPeng
b94b1efdb0
Avoid log wrong information until got PublicAddress
2015-11-10 10:45:51 +08:00
Mike Danese
9b982e1d3c
generate rc name from deployment name
2015-11-09 15:33:04 -08:00
k8s-merge-robot
699c91d4c4
Merge pull request #17026 from mikedanese/spam
...
Auto commit by PR queue bot
2015-11-09 12:20:09 -08:00
k8s-merge-robot
c0171a6427
Merge pull request #17017 from deads2k/stop-jsonpath-panic
...
Auto commit by PR queue bot
2015-11-09 12:11:14 -08:00
Mike Danese
c91dac3270
up the log level on a super spammy statement
2015-11-09 11:26:30 -08:00
deads2k
e683842359
stop panicing on bad array length
2015-11-09 13:23:16 -05:00
jiangyaoguo
b0f0c294d9
make reasons constants with clarity
2015-11-09 23:42:14 +08:00
jiangyaoguo
55bf786216
adjust container event message
2015-11-09 23:42:13 +08:00
jiangyaoguo
02f8e4277f
bubble up reason when killing pod
2015-11-09 23:42:13 +08:00
Wojciech Tyczynski
d80e0e837c
Merge pull request #10707 from kargakis/logs-with-resource-builder
...
logs: Use resource builder
2015-11-09 16:40:10 +01:00
Wojciech Tyczynski
8a8f394f0d
Merge pull request #16945 from kargakis/kubelet-fallback-to-apiserver
...
kubelet: Fallback to api server for pod status
2015-11-09 16:12:07 +01:00
k8s-merge-robot
01fbe64a34
Merge pull request #16777 from zhengguoyong/add_log_warning2
...
Auto commit by PR queue bot
2015-11-09 06:37:39 -08:00
k8s-merge-robot
5fe3733f95
Merge pull request #16272 from jiangyaoguo/remove-infra-container-event
...
Auto commit by PR queue bot
2015-11-09 06:05:35 -08:00
k8s-merge-robot
afe121669b
Merge pull request #16852 from feiskyer/kubectl-desc-ep
...
Auto commit by PR queue bot
2015-11-09 05:21:12 -08:00
k8s-merge-robot
9fe755dea6
Merge pull request #16832 from janetkuo/kubectl-apply-create
...
Auto commit by PR queue bot
2015-11-09 03:56:30 -08:00
k8s-merge-robot
3e5589c1af
Merge pull request #16997 from mikedanese/kubectl-fix
...
Auto commit by PR queue bot
2015-11-09 00:15:31 -08:00
jiangyaoguo
85d554bfc4
fix FailSync event message
2015-11-09 15:49:52 +08:00
Janet Kuo
37f35d9342
Make kubectl apply create resources if not found
2015-11-08 22:47:40 -08:00
Justin Santa Barbara
55c4140a0a
AWS: Refactor interfaces to take a single request arg
...
Cleaning up some of the older code that tried to abstract the AWS SDK,
from when the AWS SDK was less consistent (pre aws-sdk-go).
2015-11-08 22:35:12 -08:00
Mike Danese
1e3da330f4
don't print resources twice in kubectl get
2015-11-08 21:42:52 -08:00
k8s-merge-robot
c095e35f1b
Merge pull request #16756 from krousey/http_codes
...
Auto commit by PR queue bot
2015-11-08 02:15:27 -08:00
k8s-merge-robot
cf25625d46
Merge pull request #16929 from krousey/basic_auth_cleanup
...
Auto commit by PR queue bot
2015-11-07 09:58:27 -08:00
Clayton Coleman
8c1d820435
Secrets in containerized Kubelet get mangled due to 'echo'
...
Change to stream over stdin to 'cat'
2015-11-07 10:53:31 -06: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
0abc12ce5a
Merge pull request #16876 from hongchaodeng/fix-16721
...
Auto commit by PR queue bot
2015-11-07 07:31:15 -08:00
k8s-merge-robot
b8303a3983
Merge pull request #16859 from smarterclayton/allow_incluster_config
...
Auto commit by PR queue bot
2015-11-07 04:47:35 -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
k8s-merge-robot
d71a667aab
Merge pull request #16821 from caesarxuchao/restclient-timeout
...
Auto commit by PR queue bot
2015-11-07 03:11:26 -08:00
k8s-merge-robot
5988f73a4a
Merge pull request #16809 from janetkuo/apply-annotation-optional
...
Auto commit by PR queue bot
2015-11-07 02:39:23 -08:00
k8s-merge-robot
f88550ad5b
Merge pull request #15967 from timstclair/probe-params
...
Auto commit by PR queue bot
2015-11-07 01:35:18 -08:00
k8s-merge-robot
4de560389d
Merge pull request #15928 from brendandburns/sort2
...
Auto commit by PR queue bot
2015-11-07 01:03:15 -08:00
k8s-merge-robot
c5ca43f4bb
Merge pull request #16947 from lavalamp/wojtek-t-timeout_watchers
...
Auto commit by PR queue bot
2015-11-07 00:31:13 -08:00
feisky
3adb929eb9
Add kubectl describe for endpoints
2015-11-07 14:58:12 +08:00
Janet Kuo
a6a64820d7
Make generation of the apply annotation optional
2015-11-06 15:08:50 -08:00
derekwaynecarr
6ad7f1a8cb
Add event correlation to client
2015-11-06 16:59:38 -05:00
Brendan Burns
13e68d2a87
Merge pull request #16924 from brendandburns/watchdog
...
Add a deadlock watchdog
2015-11-06 13:14:14 -08:00
Daniel Smith
45a1ec73bb
Lengthen delay
2015-11-06 13:03:58 -08:00
kargakis
d519741e1b
kubelet: Fallback to api server for pod status
...
This commit fixes getting the logs from complete/failed pods after
a kubelet restart by falling back to the api server in case we fail
to resolve the pod status using the status cache.
2015-11-06 21:15:40 +01:00
Brendan Burns
c511db9113
Add a deadlock watchdog
2015-11-06 11:31:44 -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
Kris
0a4ee958c7
Use http's basic auth instead of manual encoding
2015-11-06 10:19:01 -08:00
Mike Danese
09295cd664
Headless services should not need to declare ports
2015-11-06 09:57:41 -08:00
derekwaynecarr
745c58e788
Namespace controller should always get latest state prior to deletion
2015-11-06 11:43:56 -05:00
Wojciech Tyczynski
b6a775ca50
Terminate watcher if it is full
2015-11-06 13:40:21 +01:00
k8s-merge-robot
4566e039bf
Merge pull request #16716 from huangyuqi/add_res_types_kubctl_get
...
Auto commit by PR queue bot
2015-11-06 02:20:27 -08:00
k8s-merge-robot
c7d5f3cdca
Merge pull request #16881 from krousey/client_path
...
Auto commit by PR queue bot
2015-11-06 01:11:21 -08:00
feihujiang
dfdd9b7558
Print clue for getting command prompt
2015-11-06 17:09:12 +08:00
k8s-merge-robot
0932755036
Merge pull request #16833 from hurf/agg_attach
...
Auto commit by PR queue bot
2015-11-05 22:23:35 -08:00
k8s-merge-robot
a5e4462003
Merge pull request #16825 from Random-Liu/cleanup-pod-worker-test
...
Auto commit by PR queue bot
2015-11-05 21:51:32 -08:00
feihujiang
eac8d6a997
Cleanup the content of deprecated V1beta1
2015-11-06 13:42:51 +08:00