Skip to content

Commit

Permalink
Merge pull request #1 from spacelift-io/future
Browse files Browse the repository at this point in the history
New version, python module/field conflict fixes.
  • Loading branch information
cube2222 authored Feb 18, 2021
2 parents 6ab260f + 3346bed commit 78688cf
Show file tree
Hide file tree
Showing 9 changed files with 154 additions and 154 deletions.
2 changes: 1 addition & 1 deletion provider/cmd/pulumi-resource-spacelift/schema.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/dotnet/obj/Pulumi.Spacelift.csproj.nuget.dgspec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"projects": {
"/Users/jakub/Projects/Go/src/github.com/spacelift-io/pulumi-spacelift/sdk/dotnet/Pulumi.Spacelift.csproj": {
"version": "1.1.0",
"version": "1.2.0",
"restore": {
"projectUniqueName": "/Users/jakub/Projects/Go/src/github.com/spacelift-io/pulumi-spacelift/sdk/dotnet/Pulumi.Spacelift.csproj",
"projectName": "Pulumi.Spacelift",
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/obj/project.assets.json
Original file line number Diff line number Diff line change
Expand Up @@ -5065,7 +5065,7 @@
"/Users/jakub/.nuget/packages/": {}
},
"project": {
"version": "1.1.0",
"version": "1.2.0",
"restore": {
"projectUniqueName": "/Users/jakub/Projects/Go/src/github.com/spacelift-io/pulumi-spacelift/sdk/dotnet/Pulumi.Spacelift.csproj",
"projectName": "Pulumi.Spacelift",
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/obj/project.nuget.cache
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "TxzzyA8OCumr9UgALRiFbmVi5uo1svvz78L2GoAgOH+IdwPi/+Mof+1JsD7Q16t/YX3n65Jh8uWd06ZmiQAcqQ==",
"dgSpecHash": "M8b+KlFzUwoF1uf+aNCqTNh7SIXrREDQpsiT8zTo7WgpkZ8uCOkder9Hq20qi+EJW9gpEnK3zcwgzh71YYppWw==",
"success": true,
"projectFilePath": "/Users/jakub/Projects/Go/src/github.com/spacelift-io/pulumi-spacelift/sdk/dotnet/Pulumi.Spacelift.csproj",
"expectedPackageFiles": [
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0
2 changes: 1 addition & 1 deletion sdk/nodejs/bin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spacelift-io/pulumi-spacelift",
"version": "v1.1.0",
"version": "v1.2.0",
"description": "A Pulumi package for creating and managing Spacelift resources.",
"keywords": [
"pulumi",
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/bin/pulumi_spacelift.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pulumi-spacelift
Version: 1.1.0
Version: 1.2.0
Summary: A Pulumi package for creating and managing Spacelift resources.
Home-page: https://spacelift.io
License: Apache-2.0
Expand Down
292 changes: 146 additions & 146 deletions sdk/python/bin/pulumi_spacelift/stack.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sdk/python/bin/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def readme():


setup(name='pulumi_spacelift',
version='1.1.0',
version='1.2.0',
description="A Pulumi package for creating and managing Spacelift resources.",
long_description=readme(),
long_description_content_type='text/markdown',
Expand Down

0 comments on commit 78688cf

Please sign in to comment.