OMGeeky/google-apis-rs
1
0
Fork 0
mirror of https://github.com/OMGeeky/google-apis-rs.git synced 2026-01-24 12:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(conflict): use latest gen/ from origin/master

Browse Source 
that fixes a conflict when merging
This commit is contained in:
Sebastian Thiel
2017-05-22 20:48:47 +02:00
parent 9ffa241f37
commit c6d67daa81
594 changed files with 96349 additions and 45763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gen/deploymentmanager2-cli/Cargo.toml
View File

@@ -4,7 +4,7 @@
[package]
name = "google-deploymentmanager2-cli"
version = "1.0.4+20161209"
version = "1.0.4+20170501"
authors = ["Sebastian Thiel <byronimo@gmail.com>"]
description = "A complete library to interact with Deployment Manager (protocol v2)"
repository = "https://github.com/Byron/google-apis-rs/tree/master/gen/deploymentmanager2-cli"
@@ -24,7 +24,7 @@ serde_json = "^ 0.9"
serde_derive = "^ 0.9"
yup-oauth2 = "^ 1.0"
strsim = "^0.5"
hyper-rustls = "^0.3"
hyper-rustls = "^0.6"
yup-hyper-mock = "^2.0"
clap = "^2.0"
@@ -34,4 +34,4 @@ clap = "^2.0"
[dependencies.google-deploymentmanager2]
path = "../deploymentmanager2"
version = "1.0.4+20161209"
version = "1.0.4+20170501"

2
gen/deploymentmanager2-cli/README.md
View File

@@ -25,7 +25,7 @@ Find the source code [on github](https://github.com/Byron/google-apis-rs/tree/ma
# Usage
This documentation was generated from the *Deployment Manager* API at revision *20161209*. The CLI is at version *1.0.4*.
This documentation was generated from the *Deployment Manager* API at revision *20170501*. The CLI is at version *1.0.4*.
```bash
deploymentmanager2 [options]

2
gen/deploymentmanager2-cli/mkdocs.yml
View File

@@ -1,4 +1,4 @@
site_name: Deployment Manager v1.0.4+20161209
site_name: Deployment Manager v1.0.4+20170501
site_url: http://byron.github.io/google-apis-rs/google-deploymentmanager2-cli
site_description: A complete library to interact with Deployment Manager (protocol v2)

5
gen/deploymentmanager2-cli/src/main.rs
View File

@@ -315,6 +315,7 @@ impl<'n> Engine<'n> {
let type_info: Option<(&'static str, JsonTypeInfo)> =
match &temp_cursor.to_string()[..] {
"description" => Some(("description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.description" => Some(("update.description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.manifest" => Some(("update.manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"manifest" => Some(("manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"insert-time" => Some(("insertTime", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
@@ -498,6 +499,7 @@ impl<'n> Engine<'n> {
let type_info: Option<(&'static str, JsonTypeInfo)> =
match &temp_cursor.to_string()[..] {
"description" => Some(("description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.description" => Some(("update.description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.manifest" => Some(("update.manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"manifest" => Some(("manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"insert-time" => Some(("insertTime", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
@@ -879,6 +881,7 @@ impl<'n> Engine<'n> {
let type_info: Option<(&'static str, JsonTypeInfo)> =
match &temp_cursor.to_string()[..] {
"description" => Some(("description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.description" => Some(("update.description", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"update.manifest" => Some(("update.manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"manifest" => Some(("manifest", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
"insert-time" => Some(("insertTime", JsonTypeInfo { jtype: JsonType::String, ctype: ComplexType::Pod })),
@@ -2129,7 +2132,7 @@ fn main() {
let mut app = App::new("deploymentmanager2")
.author("Sebastian Thiel <byronimo@gmail.com>")
.version("1.0.4+20161209")
.version("1.0.4+20170501")
.about("Declares, configures, and deploys complex solutions on Google Cloud Platform.")
.after_help("All documentation details can be found at http://byron.github.io/google-apis-rs/google_deploymentmanager2_cli")
.arg(Arg::with_name("url")