Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 922cc1ef32db
Choose a base ref
...
head repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48a97f5b4825
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 21, 2019

  1. Using deployment name instead of depl description for the backup oper… 

    …ation
    @tewfik-ghariani
    tewfik-ghariani committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    boesing Maximilian Bösing
    GPG key ID: 9A8988C93CEC81A3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d32a8b5 View commit details

Commits on Oct 22, 2019

  1. Merge pull request #5 from tewfik-ghariani/master 

    Tag ec2 snaps with deployment name #4
    @AmineChikhaoui
    AmineChikhaoui authored Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    boesing Maximilian Bösing
    GPG key ID: 9A8988C93CEC81A3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48a97f5 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixopsaws/backends/ec2.py
2 changes: 1 addition & 1 deletion nixopsaws/backends/ec2.py
View file
Original file line number Diff line number Diff line change
@@ -479,7 +479,7 @@ def backup(self, defn, backup_id, devices=[]):
snapshot_tags = {}
snapshot_tags.update(defn.tags)
snapshot_tags.update(self.get_common_tags())
snapshot_tags['Name'] = "{0} - {3} [{1} - {2}]".format(self.depl.description, self.name, device_stored, backup_id)
snapshot_tags['Name'] = "{0} - {3} [{1} - {2}]".format(self.depl.name, self.name, device_stored, backup_id)

self._retry(lambda: self._conn.create_tags([snapshot.id], snapshot_tags))
backup[device_stored] = snapshot.id