Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reactor model and basic tox setup #1

Merged
merged 3 commits into from
Apr 30, 2014
Merged

Reactor model and basic tox setup #1

merged 3 commits into from
Apr 30, 2014

Conversation

manasdk
Copy link
Contributor

@manasdk manasdk commented Apr 30, 2014

  • Basic tox files setup.
  • Reactor model in common as per the agreed upon repo layout.
  • The model is based on mongoengine but there is no code which would commit to any database.

Initial commit
a98bcad 
* Basic tox files setup.
* Reactor model in common as per the agreed upon repo layout.
* The model is based on mongoengine but there is no code which would commit to any database.
@enykeev
Copy link
Member

enykeev commented Apr 30, 2014

LGTM, but since we already have "Initial commit", I suggest you to rename this one.

Manas Kelshikar added 2 commits April 30, 2014 07:39
Define reactor model
4bf7d1b 
* Basic tox files setup.
* Reactor model in common as per the agreed upon repo layout.
* The model is based on mongoengine but there is no code which would commit to any database.
Merge branch 'reactor-model' of github.com:StackStorm/kandra into rea…
b809ba8 
…ctor-model
manasdk pushed a commit that referenced this pull request Apr 30, 2014
Merge pull request #1 from StackStorm/reactor-model
042889d 
Reactor model and basic tox setup
@manasdk manasdk merged commit 042889d into master Apr 30, 2014
@manasdk manasdk deleted the reactor-model branch April 30, 2014 15:05
@enykeev enykeev restored the reactor-model branch April 30, 2014 15:05
@enykeev
Copy link
Member

enykeev commented Apr 30, 2014

Lets keep it for now, i want to understand how does that happen that we have 5 commits when there should be only two or three

@manasdk
Copy link
Contributor Author

manasdk commented Apr 30, 2014

I should've sqaushed all commits down to 1 before pushing the branch and creating a pull request. I tried to squash the commits but that did not work after the fact.

@enykeev
Copy link
Member

enykeev commented Apr 30, 2014

I have never saw two commits one after the other making the same changes and I'm kind of impressed it didn't fall apart. You should have pushed your squashed version with --force flag to rewrite the history in your working branch on github. Also, I think we should consider namespacing the branches with dev/, bug/ or feature/ prefixes just to distinguish them from release branches (we may have multiple of them).

@manasdk
Copy link
Contributor Author

manasdk commented Apr 30, 2014

Prefixing branches with dev/ bug/ or feature/ make sense. I will add it to our git workflow notes.

@manasdk manasdk deleted the reactor-model branch May 21, 2014 18:04
manasdk referenced this pull request Jul 25, 2014
Fix Stormbot action params
883ef0d
m4dcoder added a commit that referenced this pull request Aug 1, 2014
@m4dcoder
Merge pull request #1 from m4dcoder/STORM-356/test-github-process
8027ca7 
[STORM-356] Test Github Process
manasdk pushed a commit that referenced this pull request Aug 7, 2014
Rename #1
ff46a2f
manasdk pushed a commit that referenced this pull request Aug 7, 2014
Rename #1
5042d86
manasdk pushed a commit that referenced this pull request Aug 7, 2014
Rename #1
2a97b66
manasdk pushed a commit that referenced this pull request Aug 7, 2014
Rename #1
7612bd5
lakshmi-kannan added a commit that referenced this pull request Aug 14, 2014
@lakshmi-kannan
Merge pull request #379 from StackStorm/jira_sensor_action
f1ec0aa 
RFR: Add sample JIRA sensor and action (Pass #1)
lakshmi-kannan added a commit that referenced this pull request Sep 17, 2014
@lakshmi-kannan
Merge pull request #507 from StackStorm/add_actions_test_cases
121ff33 
RFR: Add actions test cases pass #1
@Kami Kami mentioned this pull request Dec 21, 2014
Merged
lakshmi-kannan pushed a commit that referenced this pull request Dec 26, 2014
Integration test for results tracker. #1
8e85dd6
DoriftoShoes pushed a commit that referenced this pull request Mar 31, 2015
@kirilstrax
Merge pull request #1 from kirilstrax/patch-15
d5fbd00 
Added test_quickstart_rules
@dennybaa dennybaa mentioned this pull request Apr 23, 2015
Closed
@skarmark skarmark mentioned this pull request Jun 10, 2015
Closed
Kami pushed a commit that referenced this pull request Jun 12, 2015
Merge pull request #1 from meirwah/add_tests_for_csr
1eec258 
Add tests for csr
manasdk referenced this pull request Jul 10, 2015
@Kami
docs: Add a section on instantiating model classes.
553c57f
@manasdk manasdk mentioned this pull request Feb 8, 2016
Closed
@manasdk manasdk mentioned this pull request Mar 26, 2016
Merged
emedvedev pushed a commit that referenced this pull request Oct 6, 2016
@tonybaloney
Merge pull request #1 from emedvedev/oauth
0a9d45a 
Replace the `chatops_id` string with `nicknames` dict
Kami pushed a commit that referenced this pull request Oct 17, 2016
@punalpatel
Merge pull request #1 from punalpatel/punalpatel-patch-1
3a0b0e7 
Update st2-check-license
@nghazala nghazala mentioned this pull request Nov 14, 2016
Closed
@DuidelikeDave DuidelikeDave mentioned this pull request Dec 15, 2016
Closed
Kami added a commit that referenced this pull request Apr 4, 2019
@Kami
Merge pull request #1 from StackStorm/pluggable_rbac_backends_v30
2ac63a0 
Pluggable RBAC backends
Kami added a commit that referenced this pull request May 7, 2019
@Kami
Squashed 'lint-configs/' changes from 418d2eb45..72d3b7ca9
95e97b0 
72d3b7ca9 Merge pull request #1 from StackStorm/update_lint_configs
2709c47a2 Update lint config with changes from #4657.

git-subtree-dir: lint-configs
git-subtree-split: 72d3b7ca9e2d775b58780e49580d11c3c6414d27
m4dcoder added a commit that referenced this pull request May 10, 2019
@m4dcoder
Squashed 'lint-configs/' changes from 418d2eb..f0fd0b6
ceb46d7 
f0fd0b6 Merge pull request #2 from StackStorm/python-license-check
63e6d42 Add new .flake-proprietary config file which is to be used with proprietary repos.
67d2846 Update flake8 config to enable extensions
a164dc1 Add .gitignore to project
13e0509 Add flake8 plugin to check license header
302b88c Also ignore H210 errors.
ffbe682 Enable H checks to missing license errors are reported.
3be3554 Merge branch 'update_lint_configs'
9a5b6db Add a docstring.
73fe88f Fix merge conflict.
72d3b7c Merge pull request #1 from StackStorm/update_lint_configs
2709c47 Update lint config with changes from #4657.

git-subtree-dir: lint-configs
git-subtree-split: f0fd0b61e29a9623eeb87aaf82c3a98aab9271ff
@m4dcoder m4dcoder mentioned this pull request Jun 27, 2019
Closed
cognifloyd referenced this pull request in cognifloyd/st2 Jan 14, 2020
@Kami @cognifloyd
Merge pull request #1 from StackStorm/pluggable_rbac_backends_v30
407b843 
Pluggable RBAC backends

(cherry picked from commit 2ac63a0)
nmaludy pushed a commit that referenced this pull request Jul 21, 2020
@bishopbm1
Merge pull request #1 from StackStorm/master
3a13c58 
Merge master
arm4b pushed a commit that referenced this pull request Nov 24, 2020
@hnanchahal
Merge pull request #1 from StackStorm/master
e5e7d7f 
Updating the fork from source
winem added a commit that referenced this pull request Jun 14, 2021
@winem
Merge pull request #1 from winem/feature/github-actions-slack-notific…
fd41e1d 
…ation

Feature/GitHub actions slack notification
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@manasdk @enykeev